fix

924060929 · Jun 5, 2024 · cf0c4f0 · cf0c4f0
1 parent 3998063
commit cf0c4f0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
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
@@ -363,7 +363,7 @@ && couldConvertToMulti(agg))
              */
             RuleType.FOUR_PHASE_AGGREGATE_WITH_DISTINCT_WITH_FULL_DISTRIBUTE.build(
                 basePattern
-                    .when(agg -> agg.everyDistinctArgumentsIsOne() && !agg.getGroupByExpressions().isEmpty())
+                    .when(agg -> agg.everyDistinctArgumentNumIsOne() && !agg.getGroupByExpressions().isEmpty())
                     .when(agg ->
                         ImmutableSet.builder()
                             .addAll(agg.getGroupByExpressions())
@@ -1870,7 +1870,7 @@ private List<PhysicalHashAggregate<? extends Plan>> fourPhaseAggregateWithDistin
                                 AggregateFunction nonDistinct = aggregateFunction
                                         .withDistinctAndChildren(false, ImmutableList.copyOf(aggChild));
                                 AggregateExpression nonDistinctAggExpr = new AggregateExpression(nonDistinct,
-                                        distinctLocalParam, aggregateFunction.child(0));
+                                        distinctLocalParam, aggregateFunction);
                                 return nonDistinctAggExpr;
                             } else {
                                 needUpdateSlot.add(aggregateFunction);

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Aggregate.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/algebra/Aggregate.java
@@ -70,8 +70,8 @@ default Set<Expression> getDistinctArguments() {
         return distinctArguments.build();
     }
 
-    /** everyDistinctAggregateFunctionIsOne */
-    default boolean everyDistinctArgumentsIsOne() {
+    /** everyDistinctArgumentNumIsOne */
+    default boolean everyDistinctArgumentNumIsOne() {
         AtomicBoolean hasDistinctArguments = new AtomicBoolean(false);
         for (NamedExpression outputExpression : getOutputExpressions()) {
             boolean distinctArgumentSizeNotOne = outputExpression.anyMatch(expr -> {

diff --git a/regression-test/suites/nereids_syntax_p0/agg_4_phase.groovy b/regression-test/suites/nereids_syntax_p0/agg_4_phase.groovy
@@ -58,4 +58,6 @@ suite("agg_4_phase") {
     qt_4phase (test_sql)
 
     sql """select GROUP_CONCAT(distinct name, " ") from agg_4_phase_tbl;"""
-}
+
+    sql """select /*+SET_VAR(disable_nereids_rules='TWO_PHASE_AGGREGATE_SINGLE_DISTINCT_TO_MULTI,THREE_PHASE_AGGREGATE_WITH_DISTINCT,FOUR_PHASE_AGGREGATE_WITH_DISTINCT')*/ GROUP_CONCAT(distinct name, " ") from agg_4_phase_tbl group by gender;"""
+}