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

Fix ActionsDAG::merge

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-11-26 22:48:21 +03:00
parent c42cc8f1ff
commit 6ed4916d5d
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Interpreters/ActionsDAG.cpp
View File

@ -707,6 +707,30 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && lhs, ActionsDAG && rhs)
}
}
/// Replace inputs from rhs to nodes from lhs result.
for (auto & node : rhs.nodes)
{
for (auto & child : node.children)
{
if (child->type == ActionType::INPUT)
{
auto it = inputs_map.find(child);
if (it != inputs_map.end())
child = it->second;
}
}
}
for (auto & node : rhs.index)
{
if (node->type == ActionType::INPUT)
{
auto it = inputs_map.find(node);
if (it != inputs_map.end())
node = it->second;
}
}
/// Update index.
if (rhs.settings.project_input)
{
@ -729,19 +753,6 @@ ActionsDAGPtr ActionsDAG::merge(ActionsDAG && lhs, ActionsDAG && rhs)
lhs.index.insert(node);
}
/// Replace inputs from rhs to nodes from lhs result.
for (auto & node : rhs.nodes)
{
for (auto & child : node.children)
{
if (child->type == ActionType::INPUT)
{
auto it = inputs_map.find(child);
if (it != inputs_map.end())
child = it->second;
}
}
}
lhs.nodes.splice(lhs.nodes.end(), std::move(rhs.nodes));