diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java index 80f03d3eff8cc..452893ce62799 100644 --- a/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java +++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/faulttolerant/EventDrivenTaskSourceFactory.java @@ -227,8 +227,7 @@ private SplitAssigner createSplitAssigner( standardSplitSizeInBytes, maxArbitraryDistributionTaskSplitCount); } - if (partitioning.equals(FIXED_HASH_DISTRIBUTION) || partitioning.getCatalogHandle().isPresent() || - (partitioning.getConnectorHandle() instanceof MergePartitioningHandle)) { + if (partitioning.equals(FIXED_HASH_DISTRIBUTION)) { return HashDistributionSplitAssigner.create( partitioning.getCatalogHandle(), partitionedSources, @@ -240,7 +239,9 @@ private SplitAssigner createSplitAssigner( toIntExact(round(getFaultTolerantExecutionHashDistributionComputeTasksToNodesMinRatio(session) * nodeManager.getAllNodes().getActiveNodes().size())), Integer.MAX_VALUE); // compute tasks are bounded by the number of partitions anyways } - if (partitioning.equals(SCALED_WRITER_HASH_DISTRIBUTION)) { + if (partitioning.equals(SCALED_WRITER_HASH_DISTRIBUTION) + || partitioning.getCatalogHandle().isPresent() + || (partitioning.getConnectorHandle() instanceof MergePartitioningHandle)) { return HashDistributionSplitAssigner.create( partitioning.getCatalogHandle(), partitionedSources,