4 phase

924060929 · Apr 23, 2024 · eaeb84e · eaeb84e
1 parent 4aee706
commit eaeb84e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...e-core/src/main/java/org/apache/doris/nereids/properties/ChildrenPropertiesRegulator.java b/...e-core/src/main/java/org/apache/doris/nereids/properties/ChildrenPropertiesRegulator.java
@@ -123,6 +123,10 @@ public Boolean visitPhysicalHashAggregate(PhysicalHashAggregate<? extends Plan>
                     && agg.getOutputExpressions().size() == 1) {
                 return true;
             }
+            if (agg.getGroupByExpressions().size() > 1
+                    && agg.getGroupByExpressions().size() == agg.getOutputExpressions().size()) {
+                return true;
+            }
             return false;
         }
 

diff --git a/...core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java b/...core/src/main/java/org/apache/doris/nereids/rules/implementation/AggregateStrategies.java
@@ -300,7 +300,7 @@ && couldConvertToMulti(agg))
             RuleType.FOUR_PHASE_AGGREGATE_WITH_DISTINCT.build(
                     basePattern
                             .when(agg -> agg.getDistinctArguments().size() == 1)
-                            .when(agg -> agg.getGroupByExpressions().isEmpty())
+                            // .when(agg -> agg.getGroupByExpressions().isEmpty())
                             .thenApplyMulti(ctx -> fourPhaseAggregateWithDistinct(ctx.root, ctx.connectContext))
             )
         );