gianm closed pull request #6403: SQL: Fix too-strict check in SortProject.
URL: https://github.com/apache/incubator-druid/pull/6403
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
index 70fda1104ee..7e1a6fccda0 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
@@ -154,7 +154,7 @@ public DruidQuery(
sortingInputRowSignature = sourceRowSignature;
}
- this.sortProject = computeSortProject(partialQuery, plannerContext,
sortingInputRowSignature, grouping);
+ this.sortProject = computeSortProject(partialQuery, plannerContext,
sortingInputRowSignature);
// outputRowSignature is used only for scan and select query, and thus
sort and grouping must be null
this.outputRowSignature = sortProject == null ? sortingInputRowSignature :
sortProject.getOutputRowSignature();
@@ -328,8 +328,7 @@ private static Grouping computeGrouping(
private SortProject computeSortProject(
PartialDruidQuery partialQuery,
PlannerContext plannerContext,
- RowSignature sortingInputRowSignature,
- Grouping grouping
+ RowSignature sortingInputRowSignature
)
{
final Project sortProject = partialQuery.getSortProject();
diff --git
a/sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java
b/sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java
index a2b89df296a..f55fa18fb03 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/SortProject.java
@@ -27,6 +27,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
+import java.util.stream.Collectors;
public class SortProject
{
@@ -44,26 +45,21 @@
this.postAggregators = Preconditions.checkNotNull(postAggregators,
"postAggregators");
this.outputRowSignature = Preconditions.checkNotNull(outputRowSignature,
"outputRowSignature");
- // Verify no collisions.
- final Set<String> seen = new HashSet<>();
- inputRowSignature.getRowOrder().forEach(field -> {
- if (!seen.add(field)) {
- throw new ISE("Duplicate field name: %s", field);
- }
- });
+ final Set<String> inputColumnNames = new
HashSet<>(inputRowSignature.getRowOrder());
+ final Set<String> postAggregatorNames = postAggregators.stream()
+
.map(PostAggregator::getName)
+
.collect(Collectors.toSet());
- for (PostAggregator postAggregator : postAggregators) {
- if (postAggregator == null) {
- throw new ISE("aggregation[%s] is not a postAggregator",
postAggregator);
- }
- if (!seen.add(postAggregator.getName())) {
- throw new ISE("Duplicate field name: %s", postAggregator.getName());
+ // Verify no collisions between inputs and outputs.
+ for (String postAggregatorName : postAggregatorNames) {
+ if (inputColumnNames.contains(postAggregatorName)) {
+ throw new ISE("Duplicate field name: %s", postAggregatorName);
}
}
// Verify that items in the output signature exist.
outputRowSignature.getRowOrder().forEach(field -> {
- if (!seen.contains(field)) {
+ if (!inputColumnNames.contains(field) &&
!postAggregatorNames.contains(field)) {
throw new ISE("Missing field in rowOrder: %s", field);
}
});
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
