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

Review fixes.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-05-14 13:01:27 +03:00
parent a1e9202b93
commit 782f02b1dc
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Interpreters/ActionsDAG.cpp
View File

@ -502,7 +502,7 @@ static ColumnWithTypeAndName executeActionForHeader(const ActionsDAG::Node * nod
Block ActionsDAG::updateHeader(Block header) const
{
std::unordered_map<const Node *, ColumnWithTypeAndName> node_to_column;
std::vector<size_t> pos_to_remove;
std::set<size_t> pos_to_remove;
{
std::unordered_map<std::string_view, std::list<size_t>> input_positions;
@ -510,8 +510,6 @@ Block ActionsDAG::updateHeader(Block header) const
for (size_t pos = 0; pos < inputs.size(); ++pos)
input_positions[inputs[pos]->result_name].emplace_back(pos);
pos_to_remove.reserve(inputs.size());
for (size_t pos = 0; pos < header.columns(); ++pos)
{
const auto & col = header.getByPosition(pos);
@ -519,7 +517,7 @@ Block ActionsDAG::updateHeader(Block header) const
if (it != input_positions.end() && !it->second.empty())
{
auto & list = it->second;
pos_to_remove.push_back(pos);
pos_to_remove.insert(pos);
node_to_column[inputs[list.front()]] = std::move(col);
list.pop_front();
}
@ -585,15 +583,9 @@ Block ActionsDAG::updateHeader(Block header) const
}
if (isInputProjected())
{
header.clear();
}
else
{
std::sort(pos_to_remove.rbegin(), pos_to_remove.rend());
for (auto pos : pos_to_remove)
header.erase(pos);
}
header.erase(pos_to_remove);
Block res;