Fix reading with uncompressed cache #31826
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-bugfix
CurtizJ
commented
Nov 25, 2021
src/Core/Settings.h
Outdated
| @@ -77,7 +77,7 @@ class IColumn; | |||
| M(UInt64, s3_max_connections, 1024, "The maximum number of connections per server.", 0) \ | |||
| M(UInt64, hsts_max_age, 0, "Expired time for hsts. 0 means disable HSTS.", 0) \ | |||
| M(Bool, extremes, false, "Calculate minimums and maximums of the result columns. They can be output in JSON-formats.", IMPORTANT) \ | |||
| M(Bool, use_uncompressed_cache, false, "Whether to use the cache of uncompressed blocks.", 0) \ | |||
| M(Bool, use_uncompressed_cache, true, "Whether to use the cache of uncompressed blocks.", 0) \ | |||
There was a problem hiding this comment.
Temporarly enable this setting, because we have only 2 tests with use_uncompressed_cache=true.
CurtizJ
commented
Nov 25, 2021
| @@ -87,7 +87,7 @@ CachedCompressedReadBuffer::CachedCompressedReadBuffer( | |||
| void CachedCompressedReadBuffer::seek(size_t offset_in_compressed_file, size_t offset_in_decompressed_block) | |||
| { | |||
| /// Nothing to do if we already at required position | |||
| if (file_pos == offset_in_compressed_file | |||
| if (!owned_cell && file_pos == offset_in_compressed_file | |||
There was a problem hiding this comment.
Without this change we could proceed to next compressed block and leave offset of buffer in inconsistent state. (when we have offset() != offset_in_decompressed_block, but nextimpl_working_buffer_offset == offset_in_decompressed_block, because nextimpl_working_buffer_offset is left from previous call.
|
3 tests failed with enabled |
alesapin
approved these changes
Nov 26, 2021
This was referenced Nov 27, 2021
robot-clickhouse
pushed a commit
that referenced
this pull request
Nov 27, 2021
CurtizJ
added a commit
that referenced
this pull request
Nov 28, 2021
Backport #31826 to 21.11: Fix reading with uncompressed cache
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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fix reading from
MergeTreetables with enableduse_uncompressed_cache.Fixes #31449.