Cleanup AggreggationNode#producesDistinctRows

trinodb · Oct 16, 2024 · 8c7d277 · 8c7d277
1 parent c561d3e
commit 8c7d277
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/...src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantDistinctAggregation.java b/...src/main/java/io/trino/sql/planner/iterative/rule/RemoveRedundantDistinctAggregation.java
@@ -52,7 +52,7 @@ public class RemoveRedundantDistinctAggregation
         implements Rule<AggregationNode>
 {
     private static final Pattern<AggregationNode> PATTERN = aggregation()
-            .matching(RemoveRedundantDistinctAggregation::isDistinctOnlyAggregation);
+            .matching(AggregationNode::producesDistinctRows);
 
     @Override
     public Pattern<AggregationNode> getPattern()
@@ -72,11 +72,6 @@ public Result apply(AggregationNode aggregationNode, Captures captures, Context
         }
     }
 
-    private static boolean isDistinctOnlyAggregation(AggregationNode node)
-    {
-        return node.producesDistinctRows() && node.getGroupingSetCount() == 1;
-    }
-
     private static boolean isDistinctOverGroupingKeys(PlanNode node, Lookup lookup, Set<Symbol> parentSymbols)
     {
         return switch (node) {

diff --git a/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java b/core/trino-main/src/main/java/io/trino/sql/planner/plan/AggregationNode.java
@@ -232,7 +232,8 @@ public boolean producesDistinctRows()
     {
         return aggregations.isEmpty() &&
                 !groupingSets.getGroupingKeys().isEmpty() &&
-                outputs.size() == groupingSets.getGroupingKeys().size();
+                groupingSets.getGroupingSetCount() == 1 &&
+                outputs.size() == groupingSets.getGroupingKeys().size(); // grouping keys are always added to the outputs list, so a size match guarantees the two contain the same elements
     }
 
     public boolean isDecomposable(Session session, Metadata metadata)