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

fix review comments

Browse Source
This commit is contained in:
roman 2020-09-17 20:54:21 +01:00
parent 21bd45fb22
commit ddca262fe6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Processors/Sources/SourceWithProgress.cpp
View File

@ -93,8 +93,8 @@ void SourceWithProgress::progress(const Progress & value)
}
}
if (!leaf_limits.check(rows_to_check_limit, progress.read_bytes,"rows or bytes to read on leaf node",
ErrorCodes::TOO_MANY_ROWS, ErrorCodes::TOO_MANY_BYTES))
if (!leaf_limits.check(rows_to_check_limit, progress.read_bytes, "rows or bytes to read on leaf node",
ErrorCodes::TOO_MANY_ROWS, ErrorCodes::TOO_MANY_BYTES))
{
cancel();
}

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

@ -584,12 +584,12 @@ Pipe MergeTreeDataSelectExecutor::readFromParts(
std::atomic<size_t> total_rows {0};
SizeLimits limits;
/// bytes limit is ignored since we can't check it on this stage
limits = SizeLimits(settings.max_rows_to_read, 0, settings.read_overflow_mode);
if (settings.read_overflow_mode == OverflowMode::THROW && settings.max_rows_to_read)
limits = SizeLimits(settings.max_rows_to_read, 0, settings.read_overflow_mode);
SizeLimits leaf_limits;
/// bytes limit is ignored since we can't check it on this stage
leaf_limits = SizeLimits(settings.max_rows_to_read_leaf, 0, settings.read_overflow_mode_leaf);
if (settings.read_overflow_mode_leaf == OverflowMode::THROW && settings.max_rows_to_read_leaf)
leaf_limits = SizeLimits(settings.max_rows_to_read_leaf, 0, settings.read_overflow_mode_leaf);
auto process_part = [&](size_t part_index)
{
@ -618,7 +618,7 @@ Pipe MergeTreeDataSelectExecutor::readFromParts(
if (!ranges.ranges.empty())
{
if (settings.read_overflow_mode == OverflowMode::THROW && (limits.max_rows || leaf_limits.max_rows))
if (limits.max_rows || leaf_limits.max_rows)
{
/// Fail fast if estimated number of rows to read exceeds the limit
auto current_rows_estimate = ranges.getRowsCount();