gianm commented on code in PR #13506:
URL: https://github.com/apache/druid/pull/13506#discussion_r1127469101
##########
extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinition.java:
##########
@@ -212,24 +219,51 @@ public boolean doesShuffle()
public boolean doesSortDuringShuffle()
{
- if (shuffleSpec == null) {
+ if (shuffleSpec == null || shuffleSpec.clusterBy().isEmpty()) {
return false;
} else {
- return !shuffleSpec.getClusterBy().getColumns().isEmpty() ||
shuffleSpec.needsStatistics();
+ return shuffleSpec.clusterBy().sortable();
}
}
- public Optional<ShuffleSpec> getShuffleSpec()
+ /**
+ * Returns the {@link ShuffleSpec} for this stage, if {@link #doesShuffle()}.
+ *
+ * @throws IllegalStateException if this stage does not shuffle
+ */
+ public ShuffleSpec getShuffleSpec()
{
- return Optional.ofNullable(shuffleSpec);
+ if (shuffleSpec == null) {
+ throw new IllegalStateException("Stage does not shuffle");
+ }
+
+ return shuffleSpec;
}
Review Comment:
Yes: `doesShuffle`
##########
extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/kernel/StageDefinition.java:
##########
@@ -212,24 +219,51 @@ public boolean doesShuffle()
public boolean doesSortDuringShuffle()
{
- if (shuffleSpec == null) {
+ if (shuffleSpec == null || shuffleSpec.clusterBy().isEmpty()) {
return false;
} else {
- return !shuffleSpec.getClusterBy().getColumns().isEmpty() ||
shuffleSpec.needsStatistics();
+ return shuffleSpec.clusterBy().sortable();
}
}
- public Optional<ShuffleSpec> getShuffleSpec()
+ /**
+ * Returns the {@link ShuffleSpec} for this stage, if {@link #doesShuffle()}.
+ *
+ * @throws IllegalStateException if this stage does not shuffle
+ */
+ public ShuffleSpec getShuffleSpec()
{
- return Optional.ofNullable(shuffleSpec);
+ if (shuffleSpec == null) {
+ throw new IllegalStateException("Stage does not shuffle");
+ }
+
+ return shuffleSpec;
}
Review Comment:
Yes: `doesShuffle()`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
