thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-13 01:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try fix other tests.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-03-10 18:12:34 +03:00
parent 5ef5ec4e05
commit 3a050286f7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Interpreters/ActionsDAG.cpp
View File

@ -321,19 +321,24 @@ void ActionsDAG::removeUnusedActions(const NameSet & required_names)
void ActionsDAG::removeUnusedActions(const Names & required_names) void ActionsDAG::removeUnusedActions(const Names & required_names)
{ {
std::cerr << "ActionsDAG::removeUnusedActions\n";
NodeRawConstPtrs required_nodes; NodeRawConstPtrs required_nodes;
required_nodes.reserve(required_names.size()); required_nodes.reserve(required_names.size());
std::unordered_map<std::string_view, std::list<const Node *>> names_map; std::unordered_map<std::string_view, std::list<const Node *>> names_map;
for (const auto * node : index) for (const auto * node : index)
{
std::cerr << ".index " << node->result_name << std::endl;
names_map[node->result_name].push_back(node); names_map[node->result_name].push_back(node);
}
for (const auto & name : required_names) for (const auto & name : required_names)
{ {
std::cerr << "..req name " << name << std::endl;
auto & nodes_list = names_map[name]; auto & nodes_list = names_map[name];
if (nodes_list.empty()) if (nodes_list.empty())
throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER, throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
"Unknown column: {}, there are only columns {}", name, dumpNames()); "Unknown column: {}, there are only columns {}", name, dumpDAG());
required_nodes.push_back(nodes_list.front()); required_nodes.push_back(nodes_list.front());
nodes_list.pop_back(); nodes_list.pop_back();
@ -416,7 +421,7 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases, bool project)
"Unknown column: {}, there are only columns {}", item.first, dumpNames()); "Unknown column: {}, there are only columns {}", item.first, dumpNames());
required_nodes.push_back(it->second); required_nodes.push_back(it->second);
alias_names.insert(item.second); alias_names.insert(item.second.empty() ? item.first : item.second);
} }
if (project) if (project)
@ -454,7 +459,7 @@ void ActionsDAG::addAliases(const NamesWithAliases & aliases, bool project)
auto & alias = addNode(std::move(node)); auto & alias = addNode(std::move(node));
index.push_back(&alias); index.push_back(&alias);
} }
else if (project) else
index.push_back(child); index.push_back(child);
} }
} }