thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 2

Browse Source
This commit is contained in:
Robert Schulze 2024-08-19 19:02:28 +00:00
parent f5f8a0bc39
commit 2dc70e051e
No known key found for this signature in database
GPG Key ID: 26703B55FB13728A
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -651,6 +651,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
{
auto mark_cache = context->getIndexMarkCache();
auto uncompressed_cache = context->getIndexUncompressedCache();
auto skipping_index_cache = context->getSkippingIndexCache();
auto process_part = [&](size_t part_index)
{
@ -706,6 +707,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
reader_settings,
mark_cache.get(),
uncompressed_cache.get(),
skipping_index_cache.get(),
log);
stat.granules_dropped.fetch_add(total_granules - ranges.ranges.getNumberOfMarks(), std::memory_order_relaxed);
@ -727,7 +729,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
indices_and_condition.indices, indices_and_condition.condition,
part, ranges.ranges,
settings, reader_settings,
mark_cache.get(), uncompressed_cache.get(), log);
mark_cache.get(), uncompressed_cache.get(), skipping_index_cache.get(), log);
stat.total_granules.fetch_add(total_granules, std::memory_order_relaxed);
stat.granules_dropped.fetch_add(total_granules - ranges.ranges.getNumberOfMarks(), std::memory_order_relaxed);
@ -1345,6 +1347,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
const MergeTreeReaderSettings & reader_settings,
MarkCache * mark_cache,
UncompressedCache * uncompressed_cache,
SkippingIndexCache * skipping_index_cache,
LoggerPtr log)
{
if (!index_helper->getDeserializedFormat(part->getDataPartStorage(), index_helper->getFileName()))
@ -1381,6 +1384,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
index_ranges,
mark_cache,
uncompressed_cache,
skipping_index_cache,
reader_settings);
MarkRanges res;
@ -1461,6 +1465,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingMergedIndex(
const MergeTreeReaderSettings & reader_settings,
MarkCache * mark_cache,
UncompressedCache * uncompressed_cache,
SkippingIndexCache * skipping_index_cache,
LoggerPtr log)
{
for (const auto & index_helper : indices)
@ -1495,6 +1500,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingMergedIndex(
ranges,
mark_cache,
uncompressed_cache,
skipping_index_cache,
reader_settings));
}

2
src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
View File

@ -93,6 +93,7 @@ private:
const MergeTreeReaderSettings & reader_settings,
MarkCache * mark_cache,
UncompressedCache * uncompressed_cache,
SkippingIndexCache * skipping_index_cache,
LoggerPtr log);
static MarkRanges filterMarksUsingMergedIndex(
@ -104,6 +105,7 @@ private:
const MergeTreeReaderSettings & reader_settings,
MarkCache * mark_cache,
UncompressedCache * uncompressed_cache,
SkippingIndexCache * skipping_index_cache,
LoggerPtr log);
struct PartFilterCounters

1
src/Storages/MergeTree/MergeTreeIndexReader.h
View File

@ -18,6 +18,7 @@ public:
const MarkRanges & all_mark_ranges_,
MarkCache * mark_cache,
UncompressedCache * uncompressed_cache,
SkippingIndexCache * skipping_index_cache,
MergeTreeReaderSettings settings);
~MergeTreeIndexReader();

1
src/Storages/MergeTree/MergeTreeIndices.h
View File

@ -61,6 +61,7 @@ struct IMergeTreeIndexGranule
virtual bool empty() const = 0;
/// The in-memory size of the granule. Not expected to be 100% accurate.
virtual size_t memoryUsageBytes() const = 0;
};