thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix subqueries

Browse Source
This commit is contained in:
Michael Kolupaev 2024-03-29 04:18:44 +00:00
parent d44242e3f2
commit f9ccf95689
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Storages/MergeTree/MergeTreeIndexSet.cpp
View File

@ -257,7 +257,12 @@ MergeTreeIndexConditionSet::MergeTreeIndexConditionSet(
if (!filter_dag) if (!filter_dag)
return; return;
if (checkDAGUseless(*filter_dag->getOutputs().at(0), context)) std::vector<FutureSetPtr> sets_to_prepare;
if (checkDAGUseless(*filter_dag->getOutputs().at(0), context, sets_to_prepare))
return;
/// Try to run subqueries, don't use index if failed (e.g. if use_index_for_in_with_subqueries is disabled).
for (auto & set : sets_to_prepare)
if (!set->buildOrderedSetInplace(context))
return; return;
auto filter_actions_dag = filter_dag->clone(); auto filter_actions_dag = filter_dag->clone();
@ -370,7 +375,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::atomFromDAG(const ActionsDA
while (node_to_check->type == ActionsDAG::ActionType::ALIAS) while (node_to_check->type == ActionsDAG::ActionType::ALIAS)
node_to_check = node_to_check->children[0]; node_to_check = node_to_check->children[0];
if (node_to_check->column && isColumnConst(*node_to_check->column)) if (node_to_check->column && (isColumnConst(*node_to_check->column) || WhichDataType(node.result_type).isSet()))
return &node; return &node;
RPNBuilderTreeContext tree_context(context); RPNBuilderTreeContext tree_context(context);
@ -417,7 +422,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const Actio
while (node_to_check->type == ActionsDAG::ActionType::ALIAS) while (node_to_check->type == ActionsDAG::ActionType::ALIAS)
node_to_check = node_to_check->children[0]; node_to_check = node_to_check->children[0];
if (node_to_check->column && isColumnConst(*node_to_check->column)) if (node_to_check->column && (isColumnConst(*node_to_check->column) || WhichDataType(node.result_type).isSet()))
return nullptr; return nullptr;
if (node_to_check->type != ActionsDAG::ActionType::FUNCTION) if (node_to_check->type != ActionsDAG::ActionType::FUNCTION)
@ -473,7 +478,7 @@ const ActionsDAG::Node * MergeTreeIndexConditionSet::operatorFromDAG(const Actio
return nullptr; return nullptr;
} }
bool MergeTreeIndexConditionSet::checkDAGUseless(const ActionsDAG::Node & node, const ContextPtr & context, bool atomic) const bool MergeTreeIndexConditionSet::checkDAGUseless(const ActionsDAG::Node & node, const ContextPtr & context, std::vector<FutureSetPtr> & sets_to_prepare, bool atomic) const
{ {
const auto * node_to_check = &node; const auto * node_to_check = &node;
while (node_to_check->type == ActionsDAG::ActionType::ALIAS) while (node_to_check->type == ActionsDAG::ActionType::ALIAS)
@ -482,13 +487,17 @@ bool MergeTreeIndexConditionSet::checkDAGUseless(const ActionsDAG::Node & node,
RPNBuilderTreeContext tree_context(context); RPNBuilderTreeContext tree_context(context);
RPNBuilderTreeNode tree_node(node_to_check, tree_context); RPNBuilderTreeNode tree_node(node_to_check, tree_context);
if (node.column && isColumnConst(*node.column)) if (WhichDataType(node.result_type).isSet())
{ {
if (!atomic || WhichDataType(node.result_type).isSet()) if (auto set = tree_node.tryGetPreparedSet())
sets_to_prepare.push_back(set);
return false; return false;
}
else if (node.column && isColumnConst(*node.column))
{
Field literal; Field literal;
node.column->get(0, literal); node.column->get(0, literal);
return literal.safeGet<bool>(); return !atomic && literal.safeGet<bool>();
} }
else if (node.type == ActionsDAG::ActionType::FUNCTION) else if (node.type == ActionsDAG::ActionType::FUNCTION)
{ {
@ -500,14 +509,14 @@ bool MergeTreeIndexConditionSet::checkDAGUseless(const ActionsDAG::Node & node,
const auto & arguments = getArguments(node, nullptr, nullptr); const auto & arguments = getArguments(node, nullptr, nullptr);
if (function_name == "and" || function_name == "indexHint") if (function_name == "and" || function_name == "indexHint")
return std::all_of(arguments.begin(), arguments.end(), [&, atomic](const auto & arg) { return checkDAGUseless(*arg, context, atomic); }); return std::all_of(arguments.begin(), arguments.end(), [&, atomic](const auto & arg) { return checkDAGUseless(*arg, context, sets_to_prepare, atomic); });
else if (function_name == "or") else if (function_name == "or")
return std::any_of(arguments.begin(), arguments.end(), [&, atomic](const auto & arg) { return checkDAGUseless(*arg, context, atomic); }); return std::any_of(arguments.begin(), arguments.end(), [&, atomic](const auto & arg) { return checkDAGUseless(*arg, context, sets_to_prepare, atomic); });
else if (function_name == "not") else if (function_name == "not")
return checkDAGUseless(*arguments.at(0), context, atomic); return checkDAGUseless(*arguments.at(0), context, sets_to_prepare, atomic);
else else
return std::any_of(arguments.begin(), arguments.end(), return std::any_of(arguments.begin(), arguments.end(),
[&](const auto & arg) { return checkDAGUseless(*arg, context, true /*atomic*/); }); [&](const auto & arg) { return checkDAGUseless(*arg, context, sets_to_prepare, true /*atomic*/); });
} }
auto column_name = tree_node.getColumnName(); auto column_name = tree_node.getColumnName();

2
src/Storages/MergeTree/MergeTreeIndexSet.h
View File

@ -106,7 +106,7 @@ private:
const ContextPtr & context, const ContextPtr & context,
std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const; std::unordered_map<const ActionsDAG::Node *, const ActionsDAG::Node *> & node_to_result_node) const;
bool checkDAGUseless(const ActionsDAG::Node & node, const ContextPtr & context, bool atomic = false) const; bool checkDAGUseless(const ActionsDAG::Node & node, const ContextPtr & context, std::vector<FutureSetPtr> & sets_to_prepare, bool atomic = false) const;
String index_name; String index_name;
size_t max_rows; size_t max_rows;