thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 21:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update complie expressions.

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-11-05 20:14:18 +03:00
parent 7af517775b
commit a77596b362
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/Interpreters/ExpressionJIT.cpp
View File

@ -795,7 +795,6 @@ void ActionsDAG::compileFunctions()
}; };
std::unordered_map<const Node *, Data> data; std::unordered_map<const Node *, Data> data;
std::unordered_map<const Node *, llvm::Value *> constants;
for (const auto & node : nodes) for (const auto & node : nodes)
data[&node].is_compilable = isCompilableConstant(node) || isCompilableFunction(node); data[&node].is_compilable = isCompilableConstant(node) || isCompilableFunction(node);
@ -847,41 +846,43 @@ void ActionsDAG::compileFunctions()
cur.num_inlineable_nodes += data[child].num_inlineable_nodes; cur.num_inlineable_nodes += data[child].num_inlineable_nodes;
/// Check if we should inline current node. /// Check if we should inline current node.
bool should_compile = true;
/// Inline parents instead of node is possible. /// Inline parents instead of node is possible.
if (!cur.used_in_result && cur.all_parents_compilable) if (!cur.used_in_result && cur.all_parents_compilable)
continue; should_compile = false;
/// There is not reason to inline single node. /// There is not reason to inline single node.
/// The result of compiling function in isolation is pretty much the same as its `execute` method. /// The result of compiling function in isolation is pretty much the same as its `execute` method.
if (cur.num_inlineable_nodes <= 1) if (cur.num_inlineable_nodes <= 1)
continue; should_compile = false;;
/// Compile. if (should_compile)
std::vector<Node *> new_children;
auto dag = getCompilableDAG(frame.node, new_children);
if (dag.size() != cur.num_inlineable_nodes)
throw Exception(ErrorCodes::LOGICAL_ERROR,
"Unexpected number of nodes in compile expression DAG. "
"Expected {}, got {}. Chain: {}",
cur.num_inlineable_nodes, dag.size(), dag.dump());
if (auto fn = compile(dag, min_count_to_compile_expression, compilation_cache))
{ {
/// Replace current node to compilable function. std::vector<Node *> new_children;
auto dag = getCompilableDAG(frame.node, new_children);
if (dag.size() != cur.num_inlineable_nodes)
throw Exception(ErrorCodes::LOGICAL_ERROR,
"Unexpected number of nodes in compile expression DAG. "
"Expected {}, got {}. Chain: {}",
cur.num_inlineable_nodes, dag.size(), dag.dump());
ColumnsWithTypeAndName arguments; if (auto fn = compile(dag, min_count_to_compile_expression, compilation_cache))
arguments.reserve(new_children.size()); {
for (const auto * child : new_children) /// Replace current node to compilable function.
arguments.emplace_back(
ColumnWithTypeAndName{child->column, child->result_type, child->result_name});
frame.node->type = ActionsDAG::Type::FUNCTION; ColumnsWithTypeAndName arguments;
frame.node->function_base = fn; arguments.reserve(new_children.size());
frame.node->function = fn->prepare(arguments); for (const auto * child : new_children)
frame.node->children.swap(new_children); arguments.emplace_back(child->column, child->result_type, child->result_name);
frame.node->is_function_compiled = true;
frame.node->column = nullptr; /// Just in case. frame.node->type = ActionsDAG::Type::FUNCTION;
frame.node->function_base = fn;
frame.node->function = fn->prepare(arguments);
frame.node->children.swap(new_children);
frame.node->is_function_compiled = true;
frame.node->column = nullptr; /// Just in case.
}
} }
} }