This is an automated email from the ASF dual-hosted git repository.

starocean999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new db25165498 [fix](nereids)move AdjustAggregateNullableForEmptySet 
before NormalizeAggregate (#18147)
db25165498 is described below

commit db25165498fb6c2c691181c6538892c56c622462
Author: starocean999 <40539150+starocean...@users.noreply.github.com>
AuthorDate: Wed Mar 29 11:34:01 2023 +0800

    [fix](nereids)move AdjustAggregateNullableForEmptySet before 
NormalizeAggregate (#18147)
---
 .../org/apache/doris/nereids/jobs/batch/NereidsRewriter.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/batch/NereidsRewriter.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/batch/NereidsRewriter.java
index 15f811a7a5..93f5f3faff 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/batch/NereidsRewriter.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/batch/NereidsRewriter.java
@@ -126,6 +126,11 @@ public class NereidsRewriter extends BatchRewriteJob {
                 )
             ),
 
+            // please note: this rule must run before NormalizeAggregate
+            topDown(
+                new AdjustAggregateNullableForEmptySet()
+            ),
+
             // The rule modification needs to be done after the subquery is 
unnested,
             // because for scalarSubQuery, the connection condition is stored 
in apply in the analyzer phase,
             // but when normalizeAggregate/normalizeSort is performed, the 
members in apply cannot be obtained,
@@ -135,10 +140,6 @@ public class NereidsRewriter extends BatchRewriteJob {
                 new NormalizeSort()
             ),
 
-            topDown(
-                new AdjustAggregateNullableForEmptySet()
-            ),
-
             topic("Window analysis",
                 topDown(
                     new ExtractAndNormalizeWindowExpression(),


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to