fix having clause constant folding (apache#7507)

Change-Id: I49d7f2b17e498e8b393a8c67d85aa1196f961393 Co-authored-by: qijianliang01 <qijianliang01@baidu.com>
yujun777 · Dec 30, 2021 · 0894848 · 0894848
1 parent 85c30fc
commit 0894848
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
@@ -1394,8 +1394,8 @@ public void collectExprs(Map<String, Expr> exprMap) {
 
         }
         if (havingClause != null) {
-            registerExprId(havingClause);
-            exprMap.put(havingClause.getId().toString(), havingClause);
+            registerExprId(havingClauseAfterAnaylzed);
+            exprMap.put(havingClauseAfterAnaylzed.getId().toString(), havingClauseAfterAnaylzed);
             havingClauseAfterAnaylzed.collect(Subquery.class, subqueryExprs);
         }
         for (Subquery subquery : subqueryExprs) {
@@ -1501,7 +1501,7 @@ public void putBackExprs(Map<String, Expr> rewrittenExprMap) {
             whereClause.collect(Subquery.class, subqueryExprs);
         }
         if (havingClause != null) {
-            havingClause = rewrittenExprMap.get(havingClause.getId().toString());
+            havingClause = rewrittenExprMap.get(havingClauseAfterAnaylzed.getId().toString());
             havingClauseAfterAnaylzed.collect(Subquery.class, subqueryExprs);
         }