Fix push limit when join has predicate (#1427) (#1435)

StarRocks · Nov 19, 2021 · b04a782 · b04a782
1 parent 14935ad
commit b04a782
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/RuleSet.java b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rule/RuleSet.java
@@ -131,11 +131,12 @@ public class RuleSet {
                 new PushDownLimitJoinRule(),
                 MergeLimitDirectRule.AGGREGATE,
                 MergeLimitDirectRule.OLAP_SCAN,
-                MergeLimitDirectRule.SCHEMA_SCAN,
                 MergeLimitDirectRule.HIVE_SCAN,
+                MergeLimitDirectRule.SCHEMA_SCAN,
                 MergeLimitDirectRule.MYSQL_SCAN,
                 MergeLimitDirectRule.ES_SCAN,
                 MergeLimitDirectRule.WINDOW,
+                MergeLimitDirectRule.JOIN,
                 MergeLimitDirectRule.INTERSECT,
                 MergeLimitDirectRule.EXCEPT,
                 MergeLimitDirectRule.VALUES,

diff --git a/...e/src/main/java/com/starrocks/sql/optimizer/rule/transformation/MergeLimitDirectRule.java b/...e/src/main/java/com/starrocks/sql/optimizer/rule/transformation/MergeLimitDirectRule.java
@@ -22,7 +22,6 @@ public class MergeLimitDirectRule extends TransformationRule {
     public static final MergeLimitDirectRule ES_SCAN = new MergeLimitDirectRule(OperatorType.LOGICAL_ES_SCAN);
     public static final MergeLimitDirectRule WINDOW = new MergeLimitDirectRule(OperatorType.LOGICAL_WINDOW);
     public static final MergeLimitDirectRule JOIN = new MergeLimitDirectRule(OperatorType.LOGICAL_JOIN);
-    public static final MergeLimitDirectRule UNION = new MergeLimitDirectRule(OperatorType.LOGICAL_UNION);
     public static final MergeLimitDirectRule INTERSECT = new MergeLimitDirectRule(OperatorType.LOGICAL_INTERSECT);
     public static final MergeLimitDirectRule EXCEPT = new MergeLimitDirectRule(OperatorType.LOGICAL_EXCEPT);
     public static final MergeLimitDirectRule VALUES = new MergeLimitDirectRule(OperatorType.LOGICAL_VALUES);

diff --git a/.../src/main/java/com/starrocks/sql/optimizer/rule/transformation/PushDownLimitJoinRule.java b/.../src/main/java/com/starrocks/sql/optimizer/rule/transformation/PushDownLimitJoinRule.java
@@ -23,9 +23,11 @@ public PushDownLimitJoinRule() {
     @Override
     public boolean check(OptExpression input, OptimizerContext context) {
         LogicalLimitOperator limit = (LogicalLimitOperator) input.getOp();
+        LogicalJoinOperator join = (LogicalJoinOperator) input.getInputs().get(0).getOp();
 
         // 1. Has offset can't push down
-        return !limit.hasOffset();
+        // 2. Has predicate can't push down
+        return !limit.hasOffset() && join.getPredicate() == null;
     }
 
     @Override

diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/plan/PlanFragmentTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/plan/PlanFragmentTest.java
@@ -4265,5 +4265,4 @@ public void testPredicateOnRepeatNode() throws Exception {
                 "     PREDICATES: 1: v1 <=> 2: v2"));
         FeConstants.runningUnitTest = false;
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                     "     PREDICATES: 1: v1 <=> 2: v2"));
             FeConstants.runningUnitTest = false;
         }
     }