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

Always apply row_level_filter immediately

Browse Source
This commit is contained in:
Denis Glazachev 2021-02-20 03:18:16 +04:00
parent 2ab643170d
commit 85ea5cafc4
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -865,7 +865,7 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
return; return;
const auto & header = merge_tree_reader->getColumns(); const auto & header = merge_tree_reader->getColumns();
size_t num_columns = header.size(); const auto num_columns = header.size();
if (result.columns.size() != num_columns) if (result.columns.size() != num_columns)
throw Exception("Invalid number of columns passed to MergeTreeRangeReader. " throw Exception("Invalid number of columns passed to MergeTreeRangeReader. "
@ -900,8 +900,25 @@ void MergeTreeRangeReader::executePrewhereActionsAndFilterColumns(ReadResult & r
if (prewhere_info->row_level_filter) if (prewhere_info->row_level_filter)
{ {
prewhere_info->row_level_filter->execute(block); prewhere_info->row_level_filter->execute(block);
const auto filter_column_pos = block.getPositionByName(prewhere_info->row_level_column_name); const auto filter_column_pos = block.getPositionByName(prewhere_info->row_level_column_name);
result.addFilter(block.getByPosition(filter_column_pos).column); result.addFilter(block.getByPosition(filter_column_pos).column);
result.columns.clear();
result.columns.reserve(block.columns());
for (auto & col : block)
result.columns.emplace_back(std::move(col.column));
const auto * result_filter = result.getFilter();
filterColumns(result.columns, result_filter->getData());
auto it = block.begin();
for (auto & col : result.columns)
it++->column = std::move(col);
result.columns.clear();
result.clearFilter();
} }
prewhere_info->prewhere_actions->execute(block); prewhere_info->prewhere_actions->execute(block);