Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
924060929 committed Dec 17, 2024
1 parent 6d7c57a commit 485d42d
Showing 1 changed file with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
Expand Down Expand Up @@ -170,24 +171,25 @@ protected void assignLocalShuffleJobs(ScanSource scanSource, int instanceNum, Li
ConnectContext context, DistributedPlanWorker worker) {
// only generate one instance to scan all data, in this step
List<ScanSource> assignJoinBuckets = scanSource.parallelize(
scanNodes, instanceNum
scanNodes, 1
);

// one scan range generate multiple instances,
// different instances reference the same scan source
int shareScanId = shareScanIdGenerator.getAndIncrement();

Set<Integer> firstInstanceAssignedJoinBuckets
= ((BucketScanSource) assignJoinBuckets.get(0)).bucketIndexToScanNodeToTablets.keySet();

BucketScanSource shareScanSource = (BucketScanSource) scanSource;
ScanSource emptyShareScanSource = shareScanSource.newEmpty();

for (int i = 0; i < assignJoinBuckets.size(); i++) {
Set<Integer> assignedJoinBuckets
= ((BucketScanSource) assignJoinBuckets.get(i)).bucketIndexToScanNodeToTablets.keySet();
for (int i = 0; i < instanceNum; i++) {
LocalShuffleBucketJoinAssignedJob instance = new LocalShuffleBucketJoinAssignedJob(
instances.size(), shareScanId, i > 0,
context.nextInstanceId(), this, worker,
i == 0 ? shareScanSource : emptyShareScanSource,
Utils.fastToImmutableSet(assignedJoinBuckets)
i == 0 ? Utils.fastToImmutableSet(firstInstanceAssignedJoinBuckets) : ImmutableSet.of()
);
instances.add(instance);
}
Expand Down

0 comments on commit 485d42d

Please sign in to comment.