Fix max granules size in MergeTreeDataWriter #19123
Merged
Conversation
This file contains 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
robot-clickhouse
added
the
pr-not-for-changelog
|
Ok, I know how to fix it now, but the error caused by the code complexity.... It's sad. |
robot-clickhouse
added
pr-bugfix
alesapin
commented
Jan 15, 2021
|
|
||
| client.query("SYSTEM STOP MERGES t") | ||
|
|
||
| # These blocks size taken from the real table which reproduces the error |
alesapin
changed the title
alesapin
commented
Jan 15, 2021
| @@ -607,6 +614,11 @@ void MergeTreeDataPartWriterWide::fillIndexGranularity(size_t index_granularity_ | |||
|
|
|||
| void MergeTreeDataPartWriterWide::adjustLastMarkIfNeedAndFlushToDisk(size_t new_rows_in_last_mark) | |||
| { | |||
| /// We don't want to split already written granules to smaller | |||
| if (rows_written_in_last_mark > new_rows_in_last_mark) | |||
There was a problem hiding this comment.
Additional self-check. We have quite a lot of them, but I think it's better than possible data corruption.
alesapin
commented
Jan 15, 2021
| else /// We still can write some rows from new block into previous granule. | ||
| adjustLastMarkIfNeedAndFlushToDisk(index_granularity_for_block - rows_written_in_last_mark); | ||
| else /// We still can write some rows from new block into previous granule. So the granule size will be block granularity size. | ||
| adjustLastMarkIfNeedAndFlushToDisk(index_granularity_for_block); |
|
I think it's better to merge it to avoid strange failures in debug tests. |
This was referenced Jan 16, 2021
Merged
This was referenced Jan 16, 2021
robot-clickhouse
pushed a commit
that referenced
this pull request
Jan 16, 2021
alexey-milovidov
added a commit
that referenced
this pull request
Jan 16, 2021
Backport #19123 to 21.1: Fix max granules size in MergeTreeDataWriter
This was referenced Feb 17, 2021
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.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fix bug in merge tree data writer which can lead to marks with bigger size than fixed granularity size. Fixes #18913.