thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-15 20:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix constant result for prewhere optimization.

Browse Source
This commit is contained in:
Nikolai Kochetov 2024-10-16 19:33:23 +00:00
parent 2b73641837
commit ca237ee3c4
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
View File

@ -152,10 +152,7 @@ addNewFilterStepOrThrow(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes,
node.step = std::make_unique<FilterStep>(
node.children.at(0)->step->getOutputHeader(), std::move(split_filter), std::move(split_filter_column_name), can_remove_filter);
if (auto * join = typeid_cast<JoinStep *>(child.get()))
join->updateInputHeader(node.step->getOutputHeader(), child_idx);
else
child->updateInputHeader(node.step->getOutputHeader());
child->updateInputHeader(node.step->getOutputHeader(), child_idx);
if (update_parent_filter)
{

16
src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
View File

@ -194,6 +194,22 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
}
else
{
if (!filter_step->removesFilterColumn())
{
const auto * node = split_result.second.tryFindInOutputs(filter_step->getFilterColumnName());
if (node && !node->column)
{
ColumnWithTypeAndName column;
column.type = node->result_type;
column.name = node->result_name;
column.column = column.type->createColumnConst(0, 1u);
const auto * replaced_const = &split_result.second.addColumn(column);
for (auto & output : split_result.second.getOutputs())
if (output == node)
output = replaced_const;
}
}
/// Have to keep this expression to change column names to column identifiers
filter_node->step = std::make_unique<ExpressionStep>(
source_step_with_filter->getOutputHeader(),