Repository navigation
branch-4.2: [fix](be) Preserve pruned complex types in merge blocks - #69696
Merged
yiguolei merged 1 commit intoOct 28, 2026
Merged
Conversation
### What problem does this PR solve? Issue Number: None Related PR: apache#65396 Problem Summary: Ordered reads of nested struct fields over a rowset with multiple overlapping segments use pruned sub-column iterators, but the merge reader creates its intermediate blocks from the full physical schema. The mismatched child layouts can decode strings into numeric columns, return the wrong fields, or crash the BE. Backport the merge-block portion of apache#65396 to branch-4.2: use the FE-pruned type by column unique ID when constructing merge blocks, retaining the physical type for unpruned columns. Include focused unit and regression coverage for block reuse and nested field reads. ### Release note Fix errors and BE crashes when ordered scans read pruned complex columns across overlapping segments. ### Check List (For Author) - Test: - ASAN BE build and FE build. - Unit test: VGenericIteratorsTest.*, all 7 tests passed. - Regression test: fault_injection_p0/test_topn_pruned_struct_overlapping_segments. The original merge-block construction reproduced E-3110 for TINYINT; the same suite passed all 4 queries after restoring the fix. - Regenerated the expected output with the regression script; it matches the original PR's corresponding generated output byte for byte. - clang-format 16 passed. clang-tidy found no diagnostics on changed lines; its full run is blocked by an existing unmatched NOLINTEND in core/types.h. - Behavior changed: Yes. Merge blocks use the requested pruned complex types. - Does this need documentation: No Partial backport of 3c43f4c (merge blocks).
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
Contributor
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
yiguolei
approved these changes
Oct 28, 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.
Backport the merge-block portion of #65396 to branch-4.2: use the FE-pruned type by column unique ID when constructing merge blocks, retaining the physical type for unpruned columns.