[fix](variant) Fix variant flat-leaf root read plan#63086
Merged
eldenmoon merged 1 commit intoapache:masterfrom May 9, 2026
Merged
[fix](variant) Fix variant flat-leaf root read plan#63086eldenmoon merged 1 commit intoapache:masterfrom
eldenmoon merged 1 commit intoapache:masterfrom
Conversation
### What problem does this PR solve?
Issue Number: None
Related PR: None
Problem Summary: Flat-leaf compaction/checksum mode should keep root variant reads on the root-flat path and should not fall back to doc-value root reconstruction. Avoid probing an empty leaf path, keep explicit doc bucket columns on DOC_COMPACT, and update the doc-bucket unit test to assert that root uses VariantRootColumnIterator in flat-leaf mode.
### Release note
None
### Check List (For Author)
- Test: Unit Test
- `./run-be-ut.sh --run --filter='VariantColumnWriterReaderTest.test_read_doc_compact_from_doc_value_bucket'`: 1 test passed
- `./run-be-ut.sh --run --filter='*Variant*'`: 172 tests from 16 test suites, 171 passed, 1 skipped
- `build-support/clang-format.sh be/src/storage/segment/variant/variant_column_reader.cpp be/test/storage/segment/variant_column_writer_reader_test.cpp`
- `git diff --check`
- Behavior changed: No
- Does this need documentation: No
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Member
Author
|
run buildall |
Member
Author
|
/review |
eldenmoon
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes the BE Variant flat-leaf (compaction/checksum) read planner so root Variant reads stay on the root-flat path (VariantRootColumnIterator) instead of falling back to doc-value based reconstruction, and ensures explicit doc-value bucket columns keep using the DOC_COMPACT read path.
Changes:
- Adjust flat-leaf read planning to route root-path reads to
ReadKind::ROOT_FLAT(VariantRootColumnIterator) and avoid doc-value hierarchical fallbacks in this mode. - Ensure doc-value bucket columns are planned as
ReadKind::DOC_COMPACTin flat-leaf compaction. - Update the doc-bucket unit test to assert the root iterator type in flat-leaf mode.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| be/src/storage/segment/variant/variant_column_reader.cpp | Updates flat-leaf read-plan selection to keep root reads on ROOT_FLAT and avoid doc-value hierarchical planning in this mode. |
| be/test/storage/segment/variant_column_writer_reader_test.cpp | Updates unit test expectations to assert VariantRootColumnIterator is used for root reads in flat-leaf compaction mode. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Review result: no blocking issues found in this PR.
Critical checkpoint conclusions:
- Goal and proof: The change keeps flat-leaf compaction/checksum root variant reads on
ROOT_FLATwhile preserving explicit doc-bucket reads throughDOC_COMPACT; the updated unit test covers the iterator selection for both root and doc buckets. - Scope: The modification is small and focused on flat-leaf read planning plus the corresponding test expectation.
- Concurrency/lifecycle: No new shared state, lock ordering, or lifecycle ownership changes were introduced. The existing
_subcolumns_meta_mutexcoverage remains unchanged. - Configuration/compatibility: No new configuration, storage format, Thrift, or FE/BE protocol compatibility changes were introduced.
- Parallel paths: Query-mode hierarchical/doc reconstruction remains unchanged; only compaction/checksum flat-leaf planning is affected.
- Data correctness: The changed root branch now avoids doc-value root reconstruction in flat-leaf mode, while doc bucket paths are still handled before sparse/default fallback.
- Tests: Existing PR notes report the targeted and variant BE unit tests passed. I attempted to rerun
./run-be-ut.sh --run --filter='VariantColumnWriterReaderTest.test_read_doc_compact_from_doc_value_bucket', but this runner is missingthirdparty/installed/bin/protoc, so local verification could not complete here. - Observability/performance: No new hot-path allocations beyond the existing plan construction; no additional observability appears necessary for this narrow planner fix.
- User focus: No additional user-provided review focus was present.
Contributor
TPC-H: Total hot run time: 29537 ms |
Contributor
TPC-DS: Total hot run time: 170753 ms |
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
|
PR approved by anyone and no changes requested. |
Member
Author
Mryange
approved these changes
May 9, 2026
github-actions
Bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
github-actions Bot
pushed a commit
that referenced
this pull request
May 9, 2026
Problem Summary: Flat-leaf compaction/checksum mode should keep root variant reads on the root-flat path and should not fall back to doc-value root reconstruction. Avoid probing an empty leaf path, keep explicit doc bucket columns on DOC_COMPACT, and update the doc-bucket unit test to assert that root uses VariantRootColumnIterator in flat-leaf mode.
yiguolei
pushed a commit
that referenced
this pull request
May 10, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: None
Related PR: None
Problem Summary: Flat-leaf compaction/checksum mode should keep root variant reads on the root-flat path and should not fall back to doc-value root reconstruction. Avoid probing an empty leaf path, keep explicit doc bucket columns on DOC_COMPACT, and update the doc-bucket unit test to assert that root uses VariantRootColumnIterator in flat-leaf mode.
Release note
None
Check List (For Author)
./run-be-ut.sh --run --filter='VariantColumnWriterReaderTest.test_read_doc_compact_from_doc_value_bucket': 1 test passed./run-be-ut.sh --run --filter='*Variant*': 172 tests from 16 test suites, 171 passed, 1 skippedbuild-support/clang-format.sh be/src/storage/segment/variant/variant_column_reader.cpp be/test/storage/segment/variant_column_writer_reader_test.cppgit diff --checkintroduced by #62848