adjust rule position

apache · Sep 2, 2024 · bde263e · bde263e
1 parent de1728a
commit bde263e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java
@@ -87,7 +87,6 @@
 import org.apache.doris.nereids.rules.rewrite.LimitAggToTopNAgg;
 import org.apache.doris.nereids.rules.rewrite.LimitSortToTopN;
 import org.apache.doris.nereids.rules.rewrite.LogicalResultSinkToShortCircuitPointQuery;
-import org.apache.doris.nereids.rules.rewrite.MaxMinFilterPushDown;
 import org.apache.doris.nereids.rules.rewrite.MergeAggregate;
 import org.apache.doris.nereids.rules.rewrite.MergeFilters;
 import org.apache.doris.nereids.rules.rewrite.MergeOneRowRelationIntoUnion;
@@ -182,8 +181,7 @@ public class Rewriter extends AbstractBatchJobExecutor {
                         topDown(
                                 // ExtractSingleTableExpressionFromDisjunction conflict to InPredicateToEqualToRule
                                 // in the ExpressionNormalization, so must invoke in another job, otherwise dead loop.
-                                new ExtractSingleTableExpressionFromDisjunction(),
-                                new MaxMinFilterPushDown()
+                                new ExtractSingleTableExpressionFromDisjunction()
                         )
                 ),
                 // subquery unnesting relay on ExpressionNormalization to extract common factor expression

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/RuleSet.java
@@ -88,6 +88,7 @@
 import org.apache.doris.nereids.rules.rewrite.ConvertOuterJoinToAntiJoin;
 import org.apache.doris.nereids.rules.rewrite.CreatePartitionTopNFromWindow;
 import org.apache.doris.nereids.rules.rewrite.EliminateOuterJoin;
+import org.apache.doris.nereids.rules.rewrite.MaxMinFilterPushDown;
 import org.apache.doris.nereids.rules.rewrite.MergeFilters;
 import org.apache.doris.nereids.rules.rewrite.MergeGenerates;
 import org.apache.doris.nereids.rules.rewrite.MergeLimits;
@@ -132,6 +133,7 @@ public class RuleSet {
             .build();
 
     public static final List<RuleFactory> PUSH_DOWN_FILTERS = ImmutableList.of(
+            new MaxMinFilterPushDown(),
             new CreatePartitionTopNFromWindow(),
             new PushDownFilterThroughProject(),
             new PushDownFilterThroughSort(),

diff --git a/regression-test/data/nereids_rules_p0/max_min_filter_push_down/max_min_filter_push_down.out b/regression-test/data/nereids_rules_p0/max_min_filter_push_down/max_min_filter_push_down.out
@@ -118,6 +118,13 @@ PhysicalResultSink
 ------hashAgg[LOCAL]
 --------PhysicalStorageLayerAggregate[max_min_filter_push_down1]
 
+-- !depend_prune_column --
+PhysicalResultSink
+--hashAgg[GLOBAL]
+----hashAgg[LOCAL]
+------filter((max_min_filter_push_down1.value1 < 10))
+--------PhysicalOlapScan[max_min_filter_push_down1]
+
 -- !scalar_agg_empty_table_res --
 
 -- !min_res --
@@ -187,6 +194,10 @@ PhysicalResultSink
 -- !max_equal_scalar_agg_res --
 73
 
+-- !depend_prune_column_res --
+10
+19
+
 -- !smallint --
 PhysicalResultSink
 --hashAgg[GLOBAL]

diff --git a/...ion-test/suites/nereids_rules_p0/max_min_filter_push_down/max_min_filter_push_down.groovy b/...ion-test/suites/nereids_rules_p0/max_min_filter_push_down/max_min_filter_push_down.groovy
@@ -111,6 +111,11 @@ suite("max_min_filter_push_down") {
     select max(value1) from max_min_filter_push_down1 having max(value1) >=40;
     """
 
+    qt_depend_prune_column """
+    explain shape plan
+    select c1 from (select min(value1) c1,max(value2) from max_min_filter_push_down1 group by id having min(value1)<10) t
+    """
+
     qt_scalar_agg_empty_table_res """
     select min(value1) from max_min_filter_push_down_empty having min(value1) <40 and min(value1) <20;
     """
@@ -167,7 +172,9 @@ suite("max_min_filter_push_down") {
     qt_max_equal_scalar_agg_res """
     select max(value1) from max_min_filter_push_down1 having max(value1) >=40;
     """
-
+    qt_depend_prune_column_res """
+    select c1 from (select min(value1) c1,max(value2) from max_min_filter_push_down1 group by id having min(value1)<20) t order by c1
+    """
 
     sql "drop table if exists max_min_filter_push_down2"
     sql """create table max_min_filter_push_down2(d_int int, d_char100 char(100), d_smallint smallint, d_tinyint tinyint, d_char10 char(10),d_datetimev2 datetimev2, d_datev2 datev2)