thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix estimation of the number of marks for various thresholds

Browse Source
This commit is contained in:
Alexey Milovidov 2020-06-25 23:18:49 +03:00
parent 5d08789602
commit 8eed47857b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,10 +724,15 @@ size_t roundRowsOrBytesToMarks(
size_t rows_granularity, size_t rows_granularity,
size_t bytes_granularity) size_t bytes_granularity)
{ {
/// Marks are placed whenever threshold on rows or bytes is met.
/// So we have to return the number of marks on whatever estimate is higher - by rows or by bytes.
size_t res = (rows_setting + rows_granularity - 1) / rows_granularity;
if (bytes_granularity == 0) if (bytes_granularity == 0)
return (rows_setting + rows_granularity - 1) / rows_granularity; return res;
else else
return (bytes_setting + bytes_granularity - 1) / bytes_granularity; return std::max(res, (bytes_setting + bytes_granularity - 1) / bytes_granularity);
} }
} }
@ -759,7 +764,7 @@ Pipes MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
sum_marks += sum_marks_in_parts[i]; sum_marks += sum_marks_in_parts[i];
if (parts[i].data_part->index_granularity_info.is_adaptive) if (parts[i].data_part->index_granularity_info.is_adaptive)
adaptive_parts++; ++adaptive_parts;
} }
size_t index_granularity_bytes = 0; size_t index_granularity_bytes = 0;
@ -890,7 +895,7 @@ Pipes MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreamsWithOrder(
sum_marks += sum_marks_in_parts[i]; sum_marks += sum_marks_in_parts[i];
if (parts[i].data_part->index_granularity_info.is_adaptive) if (parts[i].data_part->index_granularity_info.is_adaptive)
adaptive_parts++; ++adaptive_parts;
} }
size_t index_granularity_bytes = 0; size_t index_granularity_bytes = 0;