thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 11:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix description after step optimizations

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-01-19 16:08:14 +03:00
parent 9db2974aaa
commit b1c7944f84
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Processors/QueryPlan/QueryPlan.cpp
View File

@ -457,6 +457,8 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
if (split_actions.first->empty()) if (split_actions.first->empty())
return; return;
auto description = parent->getStepDescription();
/// All actions was moved before ARRAY JOIN. Swap Expression and ArrayJoin. /// All actions was moved before ARRAY JOIN. Swap Expression and ArrayJoin.
if (split_actions.second->empty()) if (split_actions.second->empty())
{ {
@ -475,6 +477,8 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
filter_step->getFilterColumnName(), filter_step->getFilterColumnName(),
filter_step->removesFilterColumn()); filter_step->removesFilterColumn());
child->setStepDescription(std::move(description));
array_join_step->updateInputStream(child->getOutputStream(), expected_header); array_join_step->updateInputStream(child->getOutputStream(), expected_header);
return; return;
} }
@ -488,6 +492,7 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
node.step = std::make_unique<ExpressionStep>(node.children.at(0)->step->getOutputStream(), node.step = std::make_unique<ExpressionStep>(node.children.at(0)->step->getOutputStream(),
std::move(split_actions.first)); std::move(split_actions.first));
node.step->setStepDescription(description);
array_join_step->updateInputStream(node.step->getOutputStream(), {}); array_join_step->updateInputStream(node.step->getOutputStream(), {});
if (expression_step) if (expression_step)
@ -495,6 +500,8 @@ static void tryLiftUpArrayJoin(QueryPlan::Node * parent_node, QueryPlan::Node *
else else
parent = std::make_unique<FilterStep>(array_join_step->getOutputStream(), split_actions.second, parent = std::make_unique<FilterStep>(array_join_step->getOutputStream(), split_actions.second,
filter_step->getFilterColumnName(), filter_step->removesFilterColumn()); filter_step->getFilterColumnName(), filter_step->removesFilterColumn());
parent->setStepDescription(description + " [split]");
} }
/// Replace chain `ExpressionStep -> ExpressionStep` to single ExpressionStep /// Replace chain `ExpressionStep -> ExpressionStep` to single ExpressionStep
@ -577,6 +584,10 @@ static bool trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
filter_step->removesFilterColumn()); filter_step->removesFilterColumn());
node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second)); node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
filter_node.step->setStepDescription(filter_step->getStepDescription() + " [split]");
node->step->setStepDescription(filter_step->getStepDescription() + " [split]");
return true; return true;
} }