From 41c92481bd021c2bd979fbf99a37a30a1ae6148d Mon Sep 17 00:00:00 2001 From: minghong Date: Thu, 11 Jun 2026 16:33:58 +0800 Subject: [PATCH 1/2] remove agg normalize --- .../eageraggregation/PushDownAggregation.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java index d92bc91e61ce20..4f5f19516e377b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java @@ -35,7 +35,6 @@ package org.apache.doris.nereids.rules.rewrite.eageraggregation; import org.apache.doris.nereids.jobs.JobContext; -import org.apache.doris.nereids.rules.analysis.NormalizeAggregate; import org.apache.doris.nereids.rules.rewrite.AdjustNullable; import org.apache.doris.nereids.trees.expressions.CaseWhen; import org.apache.doris.nereids.trees.expressions.Expression; @@ -274,11 +273,12 @@ public Plan visitLogicalAggregate(LogicalAggregate agg, JobConte newOutputExpressions.add(replaceAliasExpr); } } - LogicalAggregate eagerAgg = - agg.withAggOutputChild(newOutputExpressions, child); - NormalizeAggregate normalizeAggregate = new NormalizeAggregate(); - return normalizeAggregate.normalizeAgg(eagerAgg, Optional.empty(), - context.getCascadesContext()); + return agg.withAggOutputChild(newOutputExpressions, child); + // LogicalAggregate eagerAgg = + // agg.withAggOutputChild(newOutputExpressions, child); + // NormalizeAggregate normalizeAggregate = new NormalizeAggregate(); + // return normalizeAggregate.normalizeAgg(eagerAgg, Optional.empty(), + // context.getCascadesContext()); } } catch (RuntimeException e) { String msg = "PushDownAggregation failed: " + e.getMessage() + "\n" + agg.treeString(); From 2616d6c82b6c06a893e78d232505f2b05c04084e Mon Sep 17 00:00:00 2001 From: englefly Date: Thu, 11 Jun 2026 23:26:49 +0800 Subject: [PATCH 2/2] fmt --- .../rules/rewrite/eageraggregation/PushDownAggregation.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java index 4f5f19516e377b..678824f8982a03 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/eageraggregation/PushDownAggregation.java @@ -74,7 +74,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors;