Skip to content

[Exec](performance) change colocate execution parallel num #60677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HappenLee merged 1 commit into from
Feb 13, 2026
+42 −2
Merged

[Exec](performance) change colocate execution parallel num #60677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ...che/doris/nereids/trees/plans/distribute/worker/job/UnassignedScanBucketOlapTableJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,4 +505,40 @@ private List<DistributedPlanWorker> getWorkersByReplicas(Tablet tablet, long cat
}
return workers;
}

@Override
protected int degreeOfParallelism(int maxParallel, boolean useLocalShuffleToAddParallel) {
Preconditions.checkArgument(maxParallel > 0, "maxParallel must be positive");
if (!fragment.getDataPartition().isPartitioned()) {
return 1;
}
if (fragment.queryCacheParam != null) {
return maxParallel;
}
if (scanNodes.size() == 1 && scanNodes.get(0) instanceof OlapScanNode) {
OlapScanNode olapScanNode = (OlapScanNode) scanNodes.get(0);
ConnectContext connectContext = statementContext.getConnectContext();
if (connectContext != null && olapScanNode.shouldUseOneInstance(connectContext)) {
return 1;
}
}

long tabletNum = 0;
for (ScanNode scanNode : scanNodes) {
if (scanNode instanceof OlapScanNode) {
OlapScanNode olapScanNode = (OlapScanNode) scanNode;
tabletNum = olapScanNode.getTotalTabletsNum();
break;
}
}

ConnectContext connectContext = statementContext.getConnectContext();
int colocateMaxParallelNum = 128;
if (connectContext != null) {
colocateMaxParallelNum = connectContext.getSessionVariable().colocateMaxParallelNum;
}

int maxParallelism = (int) Math.max(tabletNum, fragment.getParallelExecNum());
return Math.min(maxParallelism, colocateMaxParallelNum);
}
}
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ public class SessionVariable implements Serializable, Writable {
public static final String DISABLE_STREAMING_PREAGGREGATIONS = "disable_streaming_preaggregations";
public static final String ENABLE_DISTINCT_STREAMING_AGGREGATION = "enable_distinct_streaming_aggregation";
public static final String DISABLE_COLOCATE_PLAN = "disable_colocate_plan";
public static final String COLOCATE_MAX_PARALLEL_NUM = "colocate_max_parallel_num";
public static final String ENABLE_BUCKET_SHUFFLE_JOIN = "enable_bucket_shuffle_join";
public static final String PARALLEL_FRAGMENT_EXEC_INSTANCE_NUM = "parallel_fragment_exec_instance_num";
public static final String PARALLEL_PIPELINE_TASK_NUM = "parallel_pipeline_task_num";
Expand Down Expand Up @@ -1287,6 +1288,9 @@ public void checkQuerySlotCount(String slotCnt) {
setter = "setFragmentInstanceNum", varType = VariableAnnotation.DEPRECATED)
public int parallelExecInstanceNum = 8;

@VariableMgr.VarAttr(name = COLOCATE_MAX_PARALLEL_NUM, needForward = true, fuzzy = false)
public int colocateMaxParallelNum = 128;

@VariableMgr.VarAttr(name = PARALLEL_PIPELINE_TASK_NUM, fuzzy = true, needForward = true,
setter = "setPipelineTaskNum")
public int parallelPipelineTaskNum = 0;
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/test/java/org/apache/doris/qe/LocalShuffleWithBucketJoinTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void test() throws Exception {
PipelineDistributedPlan distributedPlan
= (PipelineDistributedPlan) distributedPlans.get(0);
List<AssignedJob> instances = distributedPlan.getInstanceJobs();
Assertions.assertEquals(beNum * parallelPipelineTaskNum, instances.size());
Assertions.assertEquals(beNum * bucketNum, instances.size());
Assertions.assertTrue(instances.stream().allMatch(LocalShuffleBucketJoinAssignedJob.class::isInstance));

long assignedBucketInstanceNum = instances.stream().map(LocalShuffleBucketJoinAssignedJob.class::cast)
Expand All @@ -80,7 +80,7 @@ public void test() throws Exception {
workerToInstances.put(instance.getAssignedWorker(), instance);
}
for (Collection<AssignedJob> instancePerBe : workerToInstances.asMap().values()) {
Assertions.assertEquals(parallelPipelineTaskNum, instancePerBe.size());
Assertions.assertEquals(bucketNum, instancePerBe.size());
}
}
}
Loading