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

Fix: distributed query with cluster() table function

Browse Source
This commit is contained in:
Igor Nikonov 2022-12-20 23:27:01 +00:00
parent 5cd4767838
commit 1624647f07
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Processors/QueryPlan/Optimizations/removeRedundantOrderBy.cpp
View File

@ -116,10 +116,8 @@ public:
explicit operator bool() const { return distributed_query; }
static bool visitTopDown(QueryPlan::Node *, QueryPlan::Node *)
{
return true;
}
static bool visitTopDown(QueryPlan::Node *, QueryPlan::Node *) { return true; }
void visitBottomUp(QueryPlan::Node * current_node, QueryPlan::Node *)
{
if (typeid_cast<ReadFromRemote *>(current_node->step.get()))
@ -275,9 +273,7 @@ private:
}
}
/// (2) for window function we do ORDER BY in 2 Sorting steps,
/// so do not delete Sorting if window function step is on top
/// (3) rough check for disributed query via Union step check
/// check steps on stack if there are some which can prevent from removing SortingStep
for (StackWithParent::const_reverse_iterator it = stack.rbegin() + 1; it != stack.rend(); ++it)
{
const QueryPlan::Node * node = it->node;
@ -288,9 +284,19 @@ private:
break;
const auto * step = node->step.get();
/// (2) for window function we do ORDER BY in 2 Sorting steps,
/// so do not delete Sorting if window function step is on top
if (typeid_cast<const WindowStep *>(step))
return false;
/// (3) TODO: need to understand that plan is part of distributed one
/// and don't try to optimize it since it's already optimized, AFAIU
/// for now, rough check for disributed query via Union step check
/// example in 02315_optimize_monotonous_functions_in_order_by_remote.sql
if (typeid_cast<const UnionStep *>(step))
return false;
if (const auto * join_step = typeid_cast<const JoinStep *>(step); join_step)
{
if (typeid_cast<const FullSortingMergeJoin *>(join_step->getJoin().get()))