This is an automated email from the ASF dual-hosted git repository.
huajianlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b80be529c11 [fix](local shuffle) fix set operation compute wrong data
because not set AggregationNode.isColocate (#59840)
b80be529c11 is described below
commit b80be529c11a300d30af8eb85c2dab8a9d688337
Author: 924060929 <[email protected]>
AuthorDate: Wed Jan 14 18:53:47 2026 +0800
[fix](local shuffle) fix set operation compute wrong data because not set
AggregationNode.isColocate (#59840)
fix set operation compute wrong data because not set
AggregationNode.isColocate
---
.../nereids/glue/translator/PhysicalPlanTranslator.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
index 430dc378c2c..776ec163df2 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/glue/translator/PhysicalPlanTranslator.java
@@ -2030,7 +2030,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
// in pipeline engine, we use parallel scan by default, but it broke
the rule of data distribution
// we need turn of parallel scan to ensure to get correct result.
if (partitionTopN.getPhase() ==
PartitionTopnPhase.ONE_PHASE_GLOBAL_PTOPN
- &&
findOlapScanNodesByPassExchangeAndJoinNode(inputFragment.getPlanRoot())) {
+ &&
findOlapScanNodesByPassExchangeNode(inputFragment.getPlanRoot())) {
inputFragment.setHasColocatePlanNode(true);
}
return inputFragment;
@@ -2365,7 +2365,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
// we need turn of parallel scan to ensure to get correct result.
// TODO: nereids forbid all parallel scan under PhysicalSetOperation
temporary
if
(!setOperation.getPhysicalProperties().equals(PhysicalProperties.ANY)
- &&
findOlapScanNodesByPassExchangeAndJoinNode(setOperationFragment.getPlanRoot()))
{
+ &&
findOlapScanNodesByPassExchangeNode(setOperationFragment.getPlanRoot())) {
setOperationFragment.setHasColocatePlanNode(true);
setOperationNode.setColocate(true);
}
@@ -2672,7 +2672,7 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
// in pipeline engine, we use parallel scan by default, but it broke
the rule of data distribution
// we need turn of parallel scan to ensure to get correct result.
// TODO: nereids forbid all parallel scan under PhysicalSetOperation
temporary
- if
(findOlapScanNodesByPassExchangeAndJoinNode(inputPlanFragment.getPlanRoot())) {
+ if
(findOlapScanNodesByPassExchangeNode(inputPlanFragment.getPlanRoot())) {
inputPlanFragment.setHasColocatePlanNode(true);
analyticEvalNode.setColocate(true);
if (root instanceof SortNode) {
@@ -3170,11 +3170,11 @@ public class PhysicalPlanTranslator extends
DefaultPlanVisitor<PlanFragment, Pla
}
}
- private boolean findOlapScanNodesByPassExchangeAndJoinNode(PlanNode root) {
+ private boolean findOlapScanNodesByPassExchangeNode(PlanNode root) {
if (root instanceof OlapScanNode) {
return true;
- } else if (!(root instanceof JoinNodeBase || root instanceof
ExchangeNode)) {
- return root.getChildren().stream().anyMatch(child ->
findOlapScanNodesByPassExchangeAndJoinNode(child));
+ } else if (!(root instanceof ExchangeNode)) {
+ return root.getChildren().stream().anyMatch(child ->
findOlapScanNodesByPassExchangeNode(child));
}
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
