fix

924060929 · Jan 6, 2025 · 1fe420c · 1fe420c
1 parent 5119d98
commit 1fe420c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.../java/org/apache/doris/nereids/trees/plans/distribute/worker/job/UnassignedGatherJob.java b/.../java/org/apache/doris/nereids/trees/plans/distribute/worker/job/UnassignedGatherJob.java
@@ -22,6 +22,7 @@
 import org.apache.doris.nereids.trees.plans.distribute.worker.DistributedPlanWorker;
 import org.apache.doris.planner.ExchangeNode;
 import org.apache.doris.planner.PlanFragment;
+import org.apache.doris.planner.PlanNode;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.collect.ImmutableList;
@@ -77,6 +78,9 @@ selectedWorker, new DefaultScanSource(ImmutableMap.of())
     }
 
     protected int degreeOfParallelism() {
+        if (fragment.getPlanRoot().anyMatch(p -> ((PlanNode) p).isSerialOperator())) {
+            return 1;
+        }
         return useLocalShuffleToAddParallel ? fragment.getParallelExecNum() : 1;
     }
 }
diff --git a/...java/org/apache/doris/nereids/trees/plans/distribute/worker/job/UnassignedShuffleJob.java b/...java/org/apache/doris/nereids/trees/plans/distribute/worker/job/UnassignedShuffleJob.java
@@ -89,6 +89,10 @@ protected int degreeOfParallelism() {
             expectInstanceNum = ConnectContext.get().getSessionVariable().getExchangeInstanceParallel();
         }
 
+        if (fragment.getPlanRoot().anyMatch(p -> ((PlanNode) p).isSerialOperator())) {
+            return 1;
+        }
+
         // TODO: check nested loop join do right outer / semi / anti join
         return expectInstanceNum;
     }