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

Apply filter only if needed

Browse Source
This commit is contained in:
Alexander Gololobov 2022-12-12 17:16:29 +01:00
parent a18850458c
commit 75152ddabb
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Storages/MergeTree/MergeTreeRangeReader.cpp
View File

@ -592,6 +592,14 @@ void MergeTreeRangeReader::ReadResult::optimize(ColumnPtr current_filter, bool c
need_filter = true;
}
/// Check if we have rows already filtered at the previous step. In such case we must apply the filter because
/// otherwise num_rows doesn't match total_rows_per_granule and the next read step will not know how to filter
/// newly read columns to match the num_rows.
if (num_rows != total_rows_per_granule)
{
need_filter = true;
}
final_filter = std::move(filter);
}
}
@ -1379,9 +1387,10 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
if (prewhere_info->remove_column)
result.columns.erase(result.columns.begin() + prewhere_column_pos);
result.optimize(current_step_filter, merge_tree_reader->canReadIncompleteGranules());
//*////////////////////
// HACK: Always apply current filter
//if (result.need_filter || prewhere_info->need_filter)
if (result.need_filter || prewhere_info->need_filter)
{
/// Filter has not been applied yet, do it now
filterColumns(result.columns, current_step_filter);
@ -1414,8 +1423,6 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
//*///////////////////
result.optimize(current_step_filter, merge_tree_reader->canReadIncompleteGranules());
LOG_TEST(log, "After execute prewhere {}", result.dumpInfo());
}