Skip to content

Use "mix" shuffle spec for target size with nil clusterBy. #17810

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
cryptoe merged 1 commit into from
Mar 19, 2025
Merged

Use "mix" shuffle spec for target size with nil clusterBy. #17810

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
17 changes: 14 additions & 3 deletions ...e/multi-stage-query/src/main/java/org/apache/druid/msq/querykit/ShuffleSpecFactories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.druid.msq.querykit;

import org.apache.druid.frame.key.ClusterBy;
import org.apache.druid.msq.kernel.GlobalSortMaxCountShuffleSpec;
import org.apache.druid.msq.kernel.GlobalSortTargetSizeShuffleSpec;
import org.apache.druid.msq.kernel.MixShuffleSpec;
Expand Down Expand Up @@ -69,11 +70,21 @@ public static ShuffleSpecFactory globalSortWithMaxPartitionCount(final int parti
}

/**
* Factory that produces globally sorted partitions of a target size.
* Factory that produces globally sorted partitions of a target size, using the {@link ClusterBy} to partition
* rows across partitions.
*
* Produces {@link MixShuffleSpec}, ignoring the target size, if the provided {@link ClusterBy} is empty.
*/
public static ShuffleSpecFactory getGlobalSortWithTargetSize(int targetSize)
{
return (clusterBy, aggregate) ->
new GlobalSortTargetSizeShuffleSpec(clusterBy, targetSize, aggregate);
return (clusterBy, aggregate) -> {
if (clusterBy.isEmpty()) {
// Cannot partition or sort meaningfully because there are no cluster-by keys. Generate a MixShuffleSpec
// so everything goes into a single partition.
return MixShuffleSpec.instance();
} else {
return new GlobalSortTargetSizeShuffleSpec(clusterBy, targetSize, aggregate);
}
};
}
}
32 changes: 32 additions & 0 deletions extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQInsertTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,38 @@
.verifyResults();
}

@MethodSource("data")
@ParameterizedTest(name = "{index}:with context {0}")
public void testInsertOnFoo1NoDimensionsWithLimit(String contextName, Map<String, Object> context)
Comment thread Dismissed
{
Map<String, Object> queryContext = ImmutableMap.<String, Object>builder()
.putAll(context)
.put(MultiStageQueryContext.CTX_ROWS_PER_SEGMENT, 2)
.build();

List<Object[]> expectedRows = ImmutableList.of(new Object[]{DateTimes.utc(0L).getMillis(), 5L});

RowSignature rowSignature = RowSignature.builder()
.addTimeColumn()
.add("cnt", ColumnType.LONG)
.build();

testIngestQuery()
.setSql("insert into foo1 select count(*) cnt from foo where dim1 != '' limit 4 partitioned by all")
.setExpectedDataSource("foo1")
.setQueryContext(queryContext)
.setExpectedRowSignature(rowSignature)
.setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedRows)
.setExpectedMSQSegmentReport(
new MSQSegmentReport(
NumberedShardSpec.class.getSimpleName(),
"Using NumberedShardSpec to generate segments since the query is inserting rows."
)
)
.verifyResults();
}

@MethodSource("data")
@ParameterizedTest(name = "{index}:with context {0}")
public void testInsertOnRestricted(String contextName, Map<String, Object> context)
Expand Down
Loading