[FLINK-36792][table] Remove FlinkJoinPushExpressionsRule.

liuyongvs · Nov 26, 2024 · 2c659dd · 2c659dd
1 parent 59dc491
commit 2c659dd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 87 deletions.
diff --git a/.../java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinPushExpressionsRule.java b/.../java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinPushExpressionsRule.java
diff --git a/...planner/src/main/scala/org/apache/flink/table/planner/plan/rules/FlinkBatchRuleSets.scala b/...planner/src/main/scala/org/apache/flink/table/planner/plan/rules/FlinkBatchRuleSets.scala
@@ -36,7 +36,7 @@ object FlinkBatchRuleSets {
     FlinkRewriteSubQueryRule.FILTER,
     FlinkSubQueryRemoveRule.FILTER,
     JoinConditionTypeCoerceRule.INSTANCE,
-    FlinkJoinPushExpressionsRule.INSTANCE
+    CoreRules.JOIN_PUSH_EXPRESSIONS
   )
 
   /** Convert sub-queries before query decorrelation. */
@@ -246,7 +246,7 @@ object FlinkBatchRuleSets {
     CoreRules.SORT_REMOVE,
 
     // join rules
-    FlinkJoinPushExpressionsRule.INSTANCE,
+    CoreRules.JOIN_PUSH_EXPRESSIONS,
     SimplifyJoinConditionRule.INSTANCE,
 
     // remove union with only a single child

diff --git a/...lanner/src/main/scala/org/apache/flink/table/planner/plan/rules/FlinkStreamRuleSets.scala b/...lanner/src/main/scala/org/apache/flink/table/planner/plan/rules/FlinkStreamRuleSets.scala
@@ -36,7 +36,7 @@ object FlinkStreamRuleSets {
     FlinkRewriteSubQueryRule.FILTER,
     FlinkSubQueryRemoveRule.FILTER,
     JoinConditionTypeCoerceRule.INSTANCE,
-    FlinkJoinPushExpressionsRule.INSTANCE
+    CoreRules.JOIN_PUSH_EXPRESSIONS
   )
 
   /** Convert sub-queries before query decorrelation. */
@@ -249,7 +249,7 @@ object FlinkStreamRuleSets {
     CoreRules.SORT_REMOVE,
 
     // join rules
-    FlinkJoinPushExpressionsRule.INSTANCE,
+    CoreRules.JOIN_PUSH_EXPRESSIONS,
     SimplifyJoinConditionRule.INSTANCE,
 
     // remove union with only a single child

diff --git a/...ical/FlinkJoinPushExpressionsRuleTest.xml → ...s/logical/JoinPushExpressionsRuleTest.xml b/...ical/FlinkJoinPushExpressionsRuleTest.xml → ...s/logical/JoinPushExpressionsRuleTest.xml
diff --git a/...al/FlinkJoinPushExpressionsRuleTest.scala → ...logical/JoinPushExpressionsRuleTest.scala b/...al/FlinkJoinPushExpressionsRuleTest.scala → ...logical/JoinPushExpressionsRuleTest.scala
@@ -22,11 +22,12 @@ import org.apache.flink.table.planner.plan.optimize.program.{BatchOptimizeContex
 import org.apache.flink.table.planner.utils.TableTestBase
 
 import org.apache.calcite.plan.hep.HepMatchOrder
+import org.apache.calcite.rel.rules.{CoreRules, JoinPushExpressionsRule}
 import org.apache.calcite.tools.RuleSets
 import org.junit.jupiter.api.{BeforeEach, Test}
 
-/** Tests for [[FlinkJoinPushExpressionsRule]]. */
-class FlinkJoinPushExpressionsRuleTest extends TableTestBase {
+/** Tests for [[JoinPushExpressionsRule]]. */
+class JoinPushExpressionsRuleTest extends TableTestBase {
 
   private val util = batchTestUtil()
 
@@ -43,7 +44,7 @@ class FlinkJoinPushExpressionsRuleTest extends TableTestBase {
           FlinkRewriteSubQueryRule.FILTER,
           FlinkSubQueryRemoveRule.FILTER,
           JoinConditionTypeCoerceRule.INSTANCE,
-          FlinkJoinPushExpressionsRule.INSTANCE
+          CoreRules.JOIN_PUSH_EXPRESSIONS
         ))
         .build()
     )