Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] Fix column overflow in RowsetUpdateState and CompactionState (backport #33246) #33520

Merged
merged 2 commits into from
Oct 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2023

This is an automatic backport of pull request #33246 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…#33246)

When the compaction output file is too large and contains many rows, the resulting buffer containing all encoded pk in this segment file may be huge and overflow. This PR fixes this by changing BinaryColumn<uint32> to BinaryColumn<int64>, adding some checks for overflow, and refactoring some compaction memory logs.

Fixes #33247

Signed-off-by: Binglin Chang <[email protected]>
(cherry picked from commit 4a2c85a)
…yColumn in primary key encoder (#33548)

Fix append is not supported between LargeBinaryColumn and BinaryColumn, so avoid using them in primary key encoder.

Signed-off-by: Binglin Chang <[email protected]>
@github-actions
Copy link

[FE Incremental Coverage Report]

pass : 0 / 0 (0%)

@github-actions
Copy link

[BE Incremental Coverage Report]

pass : 86 / 98 (87.76%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 src/storage/persistent_index.cpp 0 2 00.00% [3772, 3773]
🔵 src/storage/update_compaction_state.cpp 2 6 33.33% [130, 131, 132, 138]
🔵 src/storage/primary_key_encoder.cpp 78 84 92.86% [336, 337, 338, 339, 340, 550]
🔵 src/column/binary_column.cpp 3 3 100.00% []
🔵 src/storage/rowset_update_state.cpp 1 1 100.00% []
🔵 src/storage/primary_index.cpp 2 2 100.00% []

@wanpengfei-git wanpengfei-git merged commit c5a277d into branch-3.2 Oct 25, 2023
18 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-33246 branch October 25, 2023 03:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants