thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 01:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better #2328

Browse Source
This commit is contained in:
Alexey Milovidov 2018-05-09 07:49:34 +03:00
parent 1e9edac617
commit bd79242688
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Storages/MergeTree/MergeTreeBaseBlockInputStream.cpp
View File

@ -147,12 +147,7 @@ Block MergeTreeBaseBlockInputStream::readFromPart()
}
size_t recommended_rows = estimateNumRows(*task, task->range_reader);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wignored-qualifiers"
size_t rows_to_read = std::max(static_cast<decltype(max_block_size_rows)>(1),
std::min(max_block_size_rows, recommended_rows));
#pragma GCC diagnostic pop
size_t rows_to_read = std::max(1, std::min(max_block_size_rows, recommended_rows));
auto read_result = task->range_reader.read(rows_to_read, task->mark_ranges);