diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java index f7c047774573d4..1a59ba00adf456 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlots.java @@ -182,10 +182,14 @@ static class Resolver { private final List groupByExpressions; private final Map substitution = Maps.newHashMap(); private final List newOutputSlots = Lists.newArrayList(); + private final Map outputSubstitutionMap; Resolver(Aggregate aggregate) { outputExpressions = aggregate.getOutputExpressions(); groupByExpressions = aggregate.getGroupByExpressions(); + outputSubstitutionMap = outputExpressions.stream().filter(Alias.class::isInstance) + .collect(Collectors.toMap(alias -> alias.toSlot(), alias -> alias.child(0), + (k1, k2) -> k1)); } public void resolve(Expression expression) { @@ -272,7 +276,8 @@ private boolean checkWhetherNestedAggregateFunctionsExist(AggregateFunction aggr } private void generateAliasForNewOutputSlots(Expression expression) { - Alias alias = new Alias(expression); + Expression replacedExpr = ExpressionUtils.replace(expression, outputSubstitutionMap); + Alias alias = new Alias(replacedExpr); newOutputSlots.add(alias); substitution.put(expression, alias.toSlot()); } diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java index 7b0c8095ba63ea..d6c71ee7759a5e 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/rules/analysis/FillUpMissingSlotsTest.java @@ -32,6 +32,7 @@ import org.apache.doris.nereids.trees.expressions.functions.agg.Count; import org.apache.doris.nereids.trees.expressions.functions.agg.Min; import org.apache.doris.nereids.trees.expressions.functions.agg.Sum; +import org.apache.doris.nereids.trees.expressions.functions.scalar.Abs; import org.apache.doris.nereids.trees.expressions.literal.Literal; import org.apache.doris.nereids.trees.expressions.literal.TinyIntLiteral; import org.apache.doris.nereids.types.BigIntType; @@ -513,6 +514,29 @@ public void testSortAggregateFunction() { ).when(FieldChecker.check("outputExpressions", Lists.newArrayList(a1, countStar)))) ).when(FieldChecker.check("orderKeys", ImmutableList.of(new OrderKey(countStar.toSlot(), true, true)))) ).when(FieldChecker.check("projects", Lists.newArrayList(a1.toSlot())))); + + sql = "SELECT abs(a1) xx, sum(a2) FROM t1 GROUP BY xx ORDER BY MIN(xx)"; + a1 = new SlotReference( + new ExprId(1), "a1", TinyIntType.INSTANCE, true, + ImmutableList.of("test_resolve_aggregate_functions", "t1") + ); + Alias xx = new Alias(new ExprId(3), new Abs(a1), "xx"); + a2 = new SlotReference( + new ExprId(2), "a2", TinyIntType.INSTANCE, true, + ImmutableList.of("test_resolve_aggregate_functions", "t1") + ); + sumA2 = new Alias(new ExprId(4), new Sum(a2), "sum(a2)"); + + Alias minXX = new Alias(new ExprId(5), new Min(xx.toSlot()), "min(xx)"); + PlanChecker.from(connectContext).analyze(sql).printlnTree().matches(logicalProject( + logicalSort(logicalProject(logicalAggregate(logicalProject(logicalOlapScan()) + .when(FieldChecker.check("projects", Lists.newArrayList(xx, a2, a1)))))) + .when(FieldChecker.check("orderKeys", + ImmutableList + .of(new OrderKey(minXX.toSlot(), true, true))))) + .when(FieldChecker.check("projects", + Lists.newArrayList(xx.toSlot(), + sumA2.toSlot())))); } @Test