Skip to content

SuperSorter: Avoid storing extra writable channels. #13915

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

Closed
gianm wants to merge 1 commit into from
Closed

SuperSorter: Avoid storing extra writable channels. #13915

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
23 changes: 11 additions & 12 deletions processing/src/main/java/org/apache/druid/frame/processor/SuperSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
import java.util.Queue;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.IntStream;

/**
Expand Down Expand Up @@ -145,7 +146,8 @@ public class SuperSorter
private List<OutputChannel> outputChannels = null;

@GuardedBy("runWorkersLock")
private final Map<String, PartitionedOutputChannel> levelAndRankToReadableChannelMap = new HashMap<>();
private final Map<String, Supplier<PartitionedReadableFrameChannel>> levelAndRankToReadableChannelMap =
new HashMap<>();

@GuardedBy("runWorkersLock")
private int activeProcessors = 0;
Expand Down Expand Up @@ -511,9 +513,7 @@ private boolean runNextMiddleMerger()
if (inputsReady.remove(i)) {
String levelAndRankKey = mergerOutputFileName(inLevel, i);
PartitionedReadableFrameChannel partitionedReadableFrameChannel =
levelAndRankToReadableChannelMap.remove(levelAndRankKey)
.getReadableChannelSupplier()
.get();
levelAndRankToReadableChannelMap.remove(levelAndRankKey).get();
in.add(partitionedReadableFrameChannel.getReadableFrameChannel(0));
partitionedReadableFrameChannels.add(partitionedReadableFrameChannel);
}
Expand Down Expand Up @@ -569,7 +569,6 @@ private boolean runNextUltimateMerger()
for (long i = 0; i < numInputs; i++) {
in.add(
levelAndRankToReadableChannelMap.get(mergerOutputFileName(inLevel, i))
.getReadableChannelSupplier()
.get()
.getReadableFrameChannel(ultimateMergersRunSoFar)
);
Expand Down Expand Up @@ -599,19 +598,19 @@ private void runMerger(
String levelAndRankKey = mergerOutputFileName(level, rank);

if (totalMergingLevels != UNKNOWN_LEVEL && level == totalMergingLevels - 1) {
// Ultimate output.
final int intRank = Ints.checkedCast(rank);
final OutputChannel outputChannel = outputChannelFactory.openChannel(intRank);
outputChannels.set(intRank, outputChannel.readOnly());
frameAllocatorFactory = new SingleMemoryAllocatorFactory(outputChannel.getFrameMemoryAllocator());
writableChannel = outputChannel.getWritableChannel();
} else {
PartitionedOutputChannel partitionedOutputChannel = intermediateOutputChannelFactory.openPartitionedChannel(
levelAndRankKey,
true
);
// Inner channels, between mergers in the merge hierarchy.
PartitionedOutputChannel partitionedOutputChannel =
intermediateOutputChannelFactory.openPartitionedChannel(levelAndRankKey, true);
writableChannel = partitionedOutputChannel.getWritableChannel();
frameAllocatorFactory = new SingleMemoryAllocatorFactory(partitionedOutputChannel.getFrameMemoryAllocator());
levelAndRankToReadableChannelMap.put(levelAndRankKey, partitionedOutputChannel);
levelAndRankToReadableChannelMap.put(levelAndRankKey, partitionedOutputChannel.getReadableChannelSupplier());
}

final FrameChannelMerger worker =
Expand Down Expand Up @@ -802,10 +801,10 @@ private void cleanUp()

outputsReadyByLevel.clear();
inputBuffer.clear();
for (Map.Entry<String, PartitionedOutputChannel> cleanupEntry :
for (Map.Entry<String, Supplier<PartitionedReadableFrameChannel>> cleanupEntry :
levelAndRankToReadableChannelMap.entrySet()) {
try {
cleanupEntry.getValue().getReadableChannelSupplier().get().close();
cleanupEntry.getValue().get().close();
}
catch (IOException e) {
throw new UncheckedIOException("Unable to close channel for name : " + cleanupEntry.getKey(), e);
Expand Down