fix ut

englefly · Nov 27, 2024 · eae497f · eae497f
1 parent 5e1f661
commit eae497f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/...e/src/main/java/org/apache/doris/nereids/rules/rewrite/PushDownAggThroughJoinOneSide.java b/...e/src/main/java/org/apache/doris/nereids/rules/rewrite/PushDownAggThroughJoinOneSide.java
@@ -76,7 +76,7 @@ public List<Rule> buildRules() {
                             return !funcs.isEmpty() && funcs.stream()
                                     .allMatch(f -> (f instanceof Min || f instanceof Max || f instanceof Sum
                                             || f instanceof Count && !f.isDistinct()
-                                            && f.child(0) instanceof Slot));
+                                            && (f.children().isEmpty() || f.child(0) instanceof Slot)));
                         })
                         .thenApply(ctx -> {
                             Set<Integer> enableNereidsRules = ctx.cascadesContext.getConnectContext()

diff --git a/...rc/test/java/org/apache/doris/nereids/rules/rewrite/PushDownMinMaxSumThroughJoinTest.java b/...rc/test/java/org/apache/doris/nereids/rules/rewrite/PushDownMinMaxSumThroughJoinTest.java
@@ -323,11 +323,11 @@ void testSingleCountStar() {
                 .applyTopDown(new PushDownAggThroughJoinOneSide())
                 .printlnTree()
                 .matches(
-                        logicalAggregate(
-                                logicalJoin(
-                                        logicalOlapScan(),
+                        logicalJoin(
+                                logicalAggregate(
                                         logicalOlapScan()
-                                )
+                                ),
+                                logicalOlapScan()
                         )
                 );
     }
@@ -346,11 +346,9 @@ void testBothSideCountAndCountStar() {
         PlanChecker.from(MemoTestUtils.createConnectContext(), plan)
                 .applyTopDown(new PushDownAggThroughJoinOneSide())
                 .matches(
-                        logicalAggregate(
-                                logicalJoin(
-                                        logicalOlapScan(),
-                                        logicalOlapScan()
-                                )
+                        logicalJoin(
+                                logicalAggregate(logicalOlapScan()),
+                                logicalAggregate(logicalOlapScan())
                         )
                 );
     }