thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 21:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated MergeTreePrewhereRangeReader; renamed MergeTreePrewhereRangeReader to MergeTreeRangeReader

Browse Source
This commit is contained in:
Nikolai Kochetov 2018-02-20 15:02:25 +03:00
parent 58b6b7570f
commit 77a3989558
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/MergeTreeRangeReader.cpp
View File

@ -428,7 +428,7 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::startReadingChain(size_t
/// result.num_rows_read if the last granule in range also the last in part (so we have to adjust last granule). /// result.num_rows_read if the last granule in range also the last in part (so we have to adjust last granule).
{ {
size_t space_left = max_rows; size_t space_left = max_rows;
while (space_left && !stream.isFinished() && !ranges.empty()) while (space_left && (!stream.isFinished() || !ranges.empty()))
{ {
if (stream.isFinished()) if (stream.isFinished())
{ {

2
dbms/src/Storages/MergeTree/MergeTreeRangeReader.h
View File

@ -114,7 +114,7 @@ public:
size_t getNumAddedRows() const { return num_added_rows; } size_t getNumAddedRows() const { return num_added_rows; }
/// The number of filtered rows at all steps in reading chain. /// The number of filtered rows at all steps in reading chain.
size_t getNumFilteredRows() const { return num_filtered_rows; } size_t getNumFilteredRows() const { return num_filtered_rows; }
/// Filter you need to allply to newly-read columns in order to add them to block. /// Filter you need to apply to newly-read columns in order to add them to block.
const ColumnPtr & getFilter() const { return filter; } const ColumnPtr & getFilter() const { return filter; }
void addGranule(size_t num_rows); void addGranule(size_t num_rows);