Skip to content

Split createPartitionedDriverRunner for partitioned and upartitioned … #16608

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
raunaqmorarka merged 1 commit into from
Mar 27, 2023
Merged

Split createPartitionedDriverRunner for partitioned and upartitioned … #16608

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
19 changes: 13 additions & 6 deletions core/trino-main/src/main/java/io/trino/execution/SqlTaskExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ private synchronized void schedulePartitionedSource(SplitAssignment splitAssignm
ImmutableList.Builder<DriverSplitRunner> runners = ImmutableList.builderWithExpectedSize(removed.size());
Comment thread
radek-kondziolka marked this conversation as resolved.
Outdated
for (ScheduledSplit scheduledSplit : removed) {
// create a new driver for the split
runners.add(partitionedDriverRunnerFactory.createDriverRunner(scheduledSplit));
runners.add(partitionedDriverRunnerFactory.createPartitionedDriverRunner(scheduledSplit));
}
enqueueDriverSplitRunner(false, runners.build());

Expand All @@ -344,7 +344,7 @@ private void scheduleDriversForTaskLifeCycle()
List<DriverSplitRunner> runners = new ArrayList<>();
for (DriverSplitRunnerFactory driverRunnerFactory : driverRunnerFactoriesWithTaskLifeCycle) {
for (int i = 0; i < driverRunnerFactory.getDriverInstances().orElse(1); i++) {
runners.add(driverRunnerFactory.createDriverRunner(null));
runners.add(driverRunnerFactory.createUnpartitionedDriverRunner());
}
}
enqueueDriverSplitRunner(true, runners);
Expand Down Expand Up @@ -574,15 +574,22 @@ private DriverSplitRunnerFactory(DriverFactory driverFactory, boolean partitione
this.pipelineContext = taskContext.addPipelineContext(driverFactory.getPipelineId(), driverFactory.isInputDriver(), driverFactory.isOutputDriver(), partitioned);
}

// TODO: split this method into two: createPartitionedDriverRunner and createUnpartitionedDriverRunner.
// The former will take two arguments, and the latter will take one. This will simplify the signature quite a bit.
public DriverSplitRunner createDriverRunner(@Nullable ScheduledSplit partitionedSplit)
public DriverSplitRunner createPartitionedDriverRunner(ScheduledSplit partitionedSplit)
{
return createDriverRunner(partitionedSplit, partitionedSplit.getSplit().getSplitWeight().getRawValue());
}

public DriverSplitRunner createUnpartitionedDriverRunner()
{
return createDriverRunner(null, 0);
}

public DriverSplitRunner createDriverRunner(@Nullable ScheduledSplit partitionedSplit, long splitWeight)
{
checkState(!noMoreDriverRunner.get(), "noMoreDriverRunner is set");
pendingCreations.incrementAndGet();
// create driver context immediately so the driver existence is recorded in the stats
// the number of drivers is used to balance work across nodes
long splitWeight = partitionedSplit == null ? 0 : partitionedSplit.getSplit().getSplitWeight().getRawValue();
DriverContext driverContext = pipelineContext.addDriverContext(splitWeight);
return new DriverSplitRunner(this, driverContext, partitionedSplit);
}
Expand Down