Skip to content

branch-4.2: [fix](be) Count variant data in information_schema.column_data_sizes - #69259

Merged
yiguolei merged 1 commit into
branch-4.2from
branch-pick-68444-to-4.2
Oct 20, 2026
Merged

yiguolei merged 1 commit into
branch-4.2from
branch-pick-68444-to-4.2

Conversation

@eldenmoon

Copy link
Copy Markdown
Member

cherry-pick #68444

Adapted to branch-4.2:

  • be/test/storage/test_data/segment_flusher_format/*: the fixtures the original commit
    updates do not exist on branch-4.2 (that test was never backported), so they stay deleted.
  • branch-4.2 still has the V1 variant writer. VariantColumnWriterImpl may own only a V1
    writer, so get_total_data_pages_bytes dispatches to VariantV1ColumnWriter, which sums
    its root, subcolumn and binary writers, instead of dereferencing a null V2 writer.
    VariantSubcolumnWriter reports 0 before its writer exists.

Tested locally with
./run-be-ut.sh --run --filter='VariantColumnWriterReaderTest.*:VariantUtilTest.*'
(branch-4.2 code + this pick, RELEASE build):

  • 77 tests passed, including VariantColumnWriterReaderTest.test_write_data_normal,
    doc_compact_writer_round_trip and the two writer helpers that now assert the variant
    data page bytes, plus all 21 VariantUtilTest tests.
  • VariantColumnWriterReaderTest.test_nested_iter fails, but it fails on branch-4.2 without
    this change as well (_process_nested_columns no longer returns an error for a different
    array offset), so it is not caused by this pick.

The new regression suite query_p0/system/test_query_sys_column_data_sizes_variant was not
run locally (needs a cluster).

@eldenmoon
eldenmoon requested a review from yiguolei as a code owner October 19, 2026 04:42
@hello-stephen

Copy link
Copy Markdown
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@eldenmoon

Copy link
Copy Markdown
Member Author

run buildall

@eldenmoon
eldenmoon force-pushed the branch-pick-68444-to-4.2 branch from c3f6455 to c6933d2 Compare October 19, 2026 06:38
@eldenmoon

Copy link
Copy Markdown
Member Author

run buildall

@eldenmoon
eldenmoon force-pushed the branch-pick-68444-to-4.2 branch from c6933d2 to edb85fc Compare October 19, 2026 07:39
@eldenmoon

Copy link
Copy Markdown
Member Author

run buildall

@hello-stephen

Copy link
Copy Markdown
Contributor

BE UT Coverage Report

Increment line coverage 71.43% (75/105) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 64.00% (29658/46340)
Line Coverage 48.83% (312223/639470)
Region Coverage 44.64% (251113/562475)
Branch Coverage 46.29% (118308/255599)

@hello-stephen

Copy link
Copy Markdown
Contributor

BE Regression && UT Coverage Report

Increment line coverage 100.00% (105/105) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 76.20% (34299/45009)
Line Coverage 61.01% (386865/634143)
Region Coverage 57.82% (325775/563458)
Branch Coverage 58.77% (150073/255339)

@yiguolei
yiguolei merged commit 375c32a into branch-4.2 Oct 20, 2026
30 of 32 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by anyone and no changes requested.

@github-actions github-actions Bot added the approved Indicates a PR has been approved by one committer. label Oct 20, 2026
@github-actions

Copy link
Copy Markdown
Contributor

PR approved by at least one committer and no changes requested.

@eldenmoon
eldenmoon deleted the branch-pick-68444-to-4.2 branch October 20, 2026 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants