thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-12 09:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix approx total rows accounting for reverse reading from MergeTree

Browse Source
This commit is contained in:
Azat Khuzhin 2021-04-06 21:13:51 +03:00
parent e7e17adc64
commit 60b000ed51
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Storages/MergeTree/MergeTreeReverseSelectProcessor.cpp
View File

@ -44,12 +44,11 @@ MergeTreeReverseSelectProcessor::MergeTreeReverseSelectProcessor(
for (const auto & range : all_mark_ranges) for (const auto & range : all_mark_ranges)
total_marks_count += range.end - range.begin; total_marks_count += range.end - range.begin;
size_t total_rows = data_part->index_granularity.getTotalRows(); size_t total_rows = data_part->index_granularity.getRowsCountInRanges(all_mark_ranges);
if (!quiet) if (!quiet)
LOG_TRACE(log, "Reading {} ranges in reverse order from part {}, approx. {}, up to {} rows starting from {}", LOG_TRACE(log, "Reading {} ranges in reverse order from part {}, approx. {} rows starting from {}",
all_mark_ranges.size(), data_part->name, total_rows, all_mark_ranges.size(), data_part->name, total_rows,
data_part->index_granularity.getRowsCountInRanges(all_mark_ranges),
data_part->index_granularity.getMarkStartingRow(all_mark_ranges.front().begin)); data_part->index_granularity.getMarkStartingRow(all_mark_ranges.front().begin));
addTotalRowsApprox(total_rows); addTotalRowsApprox(total_rows);

0
tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference Normal file
View File

10
tests/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql Normal file
View File

@ -0,0 +1,10 @@
drop table if exists data_01801;
create table data_01801 (key Int) engine=MergeTree() order by key settings index_granularity=10 as select number/10 from numbers(100);
select * from data_01801 where key = 0 order by key settings max_rows_to_read=9 format Null; -- { serverError 158 }
select * from data_01801 where key = 0 order by key desc settings max_rows_to_read=9 format Null; -- { serverError 158 }
select * from data_01801 where key = 0 order by key settings max_rows_to_read=10 format Null;
select * from data_01801 where key = 0 order by key desc settings max_rows_to_read=10 format Null;
drop table data_01801;