fix

924060929 · Jul 10, 2024 · 81c3cd2 · 81c3cd2
1 parent 972c7b4
commit 81c3cd2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/...org/apache/doris/nereids/trees/plans/distribute/worker/job/AbstractUnassignedScanJob.java b/...org/apache/doris/nereids/trees/plans/distribute/worker/job/AbstractUnassignedScanJob.java
@@ -51,7 +51,16 @@ public List<AssignedJob> computeAssignedJobs(DistributedPlanWorkerManager worker
         Map<DistributedPlanWorker, UninstancedScanSource> workerToScanSource = multipleMachinesParallelization(
                 workerManager, inputJobs);
 
-        return insideMachineParallelization(workerToScanSource, inputJobs, workerManager);
+        List<AssignedJob> assignedJobs = insideMachineParallelization(workerToScanSource, inputJobs, workerManager);
+
+        return fillUpAssignedJobs(assignedJobs, workerManager, inputJobs);
+    }
+
+    protected List<AssignedJob> fillUpAssignedJobs(
+            List<AssignedJob> assignedJobs,
+            DistributedPlanWorkerManager workerManager,
+            ListMultimap<ExchangeNode, AssignedJob> inputJobs) {
+        return assignedJobs;
     }
 
     protected abstract Map<DistributedPlanWorker, UninstancedScanSource> multipleMachinesParallelization(

diff --git a/...org/apache/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanMetadataJob.java b/...org/apache/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanMetadataJob.java
@@ -52,11 +52,8 @@ protected Map<DistributedPlanWorker, UninstancedScanSource> multipleMachinesPara
     }
 
     @Override
-    protected List<AssignedJob> insideMachineParallelization(
-            Map<DistributedPlanWorker, UninstancedScanSource> workerToScanRanges,
-            ListMultimap<ExchangeNode, AssignedJob> inputJobs, DistributedPlanWorkerManager workerManager) {
-        List<AssignedJob> assignedJobs = super.insideMachineParallelization(
-                workerToScanRanges, inputJobs, workerManager);
+    protected List<AssignedJob> fillUpAssignedJobs(List<AssignedJob> assignedJobs,
+            DistributedPlanWorkerManager workerManager, ListMultimap<ExchangeNode, AssignedJob> inputJobs) {
         if (assignedJobs.isEmpty()) {
             return fillUpSingleEmptyInstance(workerManager);
         }

diff --git a/...che/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanSingleOlapTableJob.java b/...che/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanSingleOlapTableJob.java
@@ -77,8 +77,12 @@ protected List<AssignedJob> insideMachineParallelization(
         //        instance 5: olapScanNode1: ScanRanges([tablet_10007])
         //    ],
         // }
-        List<AssignedJob> assignedJobs = super.insideMachineParallelization(
-                workerToScanRanges, inputJobs, workerManager);
+        return super.insideMachineParallelization(workerToScanRanges, inputJobs, workerManager);
+    }
+
+    @Override
+    protected List<AssignedJob> fillUpAssignedJobs(List<AssignedJob> assignedJobs,
+            DistributedPlanWorkerManager workerManager, ListMultimap<ExchangeNode, AssignedJob> inputJobs) {
         if (assignedJobs.isEmpty()) {
             // the tablets have pruned, so no assignedJobs,
             // we should allocate an instance of it,

diff --git a/...e/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanSingleRemoteTableJob.java b/...e/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanSingleRemoteTableJob.java
@@ -53,11 +53,8 @@ protected Map<DistributedPlanWorker, UninstancedScanSource> multipleMachinesPara
     }
 
     @Override
-    protected List<AssignedJob> insideMachineParallelization(
-            Map<DistributedPlanWorker, UninstancedScanSource> workerToScanRanges,
-            ListMultimap<ExchangeNode, AssignedJob> inputJobs, DistributedPlanWorkerManager workerManager) {
-        List<AssignedJob> assignedJobs = super.insideMachineParallelization(
-                workerToScanRanges, inputJobs, workerManager);
+    protected List<AssignedJob> fillUpAssignedJobs(List<AssignedJob> assignedJobs,
+            DistributedPlanWorkerManager workerManager, ListMultimap<ExchangeNode, AssignedJob> inputJobs) {
         if (assignedJobs.isEmpty()) {
             // the file scan have pruned, so no assignedJobs,
             // we should allocate an instance of it,