From c15292d4cf0d25c52078fe9a3c2c2dc202c6c2ce Mon Sep 17 00:00:00 2001
From: feiniaofeiafei <moailing@selectdb.com>
Date: Tue, 11 Jun 2024 21:37:48 +0800
Subject: [PATCH 1/2] [Fix](nereids) fix merge aggregate rule, rules should not
 have mutable members

---
 .../doris/nereids/rules/rewrite/MergeAggregate.java  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
index 23fbd9786568eb..bd3f1e4a5a886d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
@@ -52,7 +52,6 @@
 public class MergeAggregate implements RewriteRuleFactory {
     private static final ImmutableSet<String> ALLOW_MERGE_AGGREGATE_FUNCTIONS =
             ImmutableSet.of("min", "max", "sum", "any_value");
-    private Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = new HashMap<>();
 
     @Override
     public List<Rule> buildRules() {
@@ -75,7 +74,10 @@ public List<Rule> buildRules() {
      */
     private Plan mergeTwoAggregate(LogicalAggregate<LogicalAggregate<Plan>> outerAgg) {
         LogicalAggregate<Plan> innerAgg = outerAgg.child();
-
+        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
+                .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
+                .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
+                        (existValue, newValue) -> existValue));
         List<NamedExpression> newOutputExpressions = outerAgg.getOutputExpressions().stream()
                 .map(e -> rewriteAggregateFunction(e, innerAggExprIdToAggFunc))
                 .collect(Collectors.toList());
@@ -97,6 +99,10 @@ private Plan mergeAggProjectAgg(LogicalAggregate<LogicalProject<LogicalAggregate
         List<NamedExpression> outputExpressions = outerAgg.getOutputExpressions();
         List<NamedExpression> replacedOutputExpressions = PlanUtils.replaceExpressionByProjections(
                                 project.getProjects(), (List) outputExpressions);
+        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
+                .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
+                .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
+                        (existValue, newValue) -> existValue));
         // rewrite agg function. e.g. max(max)
         List<NamedExpression> replacedAggFunc = replacedOutputExpressions.stream()
                 .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
@@ -152,7 +158,7 @@ private NamedExpression rewriteAggregateFunction(NamedExpression e,
 
     private boolean commonCheck(LogicalAggregate<? extends Plan> outerAgg, LogicalAggregate<Plan> innerAgg,
             boolean sameGroupBy, Optional<LogicalProject> projectOptional) {
-        innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
+        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
                 .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
                 .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
                         (existValue, newValue) -> existValue));

From fc2a170d015f77d49d0ac2867e11c68d65fe4605 Mon Sep 17 00:00:00 2001
From: feiniaofeiafei <moailing@selectdb.com>
Date: Wed, 12 Jun 2024 17:52:51 +0800
Subject: [PATCH 2/2] [Fix](nereids) fix merge aggregate rule, rules should not
 have mutable members

---
 .../nereids/rules/rewrite/MergeAggregate.java | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
index bd3f1e4a5a886d..4b9e745ee201f4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/MergeAggregate.java
@@ -74,10 +74,7 @@ public List<Rule> buildRules() {
      */
     private Plan mergeTwoAggregate(LogicalAggregate<LogicalAggregate<Plan>> outerAgg) {
         LogicalAggregate<Plan> innerAgg = outerAgg.child();
-        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
-                .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
-                .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
-                        (existValue, newValue) -> existValue));
+        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = getInnerAggExprIdToAggFuncMap(innerAgg);
         List<NamedExpression> newOutputExpressions = outerAgg.getOutputExpressions().stream()
                 .map(e -> rewriteAggregateFunction(e, innerAggExprIdToAggFunc))
                 .collect(Collectors.toList());
@@ -99,10 +96,7 @@ private Plan mergeAggProjectAgg(LogicalAggregate<LogicalProject<LogicalAggregate
         List<NamedExpression> outputExpressions = outerAgg.getOutputExpressions();
         List<NamedExpression> replacedOutputExpressions = PlanUtils.replaceExpressionByProjections(
                                 project.getProjects(), (List) outputExpressions);
-        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
-                .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
-                .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
-                        (existValue, newValue) -> existValue));
+        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = getInnerAggExprIdToAggFuncMap(innerAgg);
         // rewrite agg function. e.g. max(max)
         List<NamedExpression> replacedAggFunc = replacedOutputExpressions.stream()
                 .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
@@ -158,10 +152,7 @@ private NamedExpression rewriteAggregateFunction(NamedExpression e,
 
     private boolean commonCheck(LogicalAggregate<? extends Plan> outerAgg, LogicalAggregate<Plan> innerAgg,
             boolean sameGroupBy, Optional<LogicalProject> projectOptional) {
-        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = innerAgg.getOutputExpressions().stream()
-                .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
-                .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
-                        (existValue, newValue) -> existValue));
+        Map<ExprId, AggregateFunction> innerAggExprIdToAggFunc = getInnerAggExprIdToAggFuncMap(innerAgg);
         Set<AggregateFunction> aggregateFunctions = outerAgg.getAggregateFunctions();
         List<AggregateFunction> replacedAggFunctions = projectOptional.map(project ->
                 (List<AggregateFunction>) PlanUtils.replaceExpressionByProjections(
@@ -231,4 +222,11 @@ private boolean canMergeAggregateWithProject(LogicalAggregate<LogicalProject<Log
         boolean sameGroupBy = (innerAgg.getGroupByExpressions().size() == outerAgg.getGroupByExpressions().size());
         return commonCheck(outerAgg, innerAgg, sameGroupBy, Optional.of(project));
     }
+
+    private Map<ExprId, AggregateFunction> getInnerAggExprIdToAggFuncMap(LogicalAggregate<Plan> innerAgg) {
+        return innerAgg.getOutputExpressions().stream()
+                .filter(expr -> (expr instanceof Alias) && (expr.child(0) instanceof AggregateFunction))
+                .collect(Collectors.toMap(NamedExpression::getExprId, value -> (AggregateFunction) value.child(0),
+                        (existValue, newValue) -> existValue));
+    }
 }