[CALCITE-6718] Optimize SubstitutionVisitor's splitFilter with early …

…return and uniform simplification for equivalence checking
apache · Dec 6, 2024 · 18bc5f7 · 18bc5f7
1 parent 0eb83b1
commit 18bc5f7
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java b/core/src/main/java/org/apache/calcite/plan/SubstitutionVisitor.java
@@ -295,6 +295,9 @@ void register(MutableRel result, MutableRel query) {
   @VisibleForTesting
   public static @Nullable RexNode splitFilter(final RexSimplify simplify,
       RexNode condition, RexNode target) {
+    if (target.isAlwaysTrue()) {
+      return condition;
+    }
     final RexBuilder rexBuilder = simplify.rexBuilder;
     condition = simplify.simplify(condition);
     target = simplify.simplify(target);
@@ -322,7 +325,9 @@ void register(MutableRel result, MutableRel query) {
               ImmutableList.of(condition2, target2));
       RexNode r =
           canonizeNode(rexBuilder, simplify.simplifyUnknownAsFalse(x2));
-      if (!r.isAlwaysFalse() && isEquivalent(condition2, r)) {
+      RexNode simplifiedCond2 =
+          canonizeNode(rexBuilder, simplify.simplifyUnknownAsFalse(condition2));
+      if (!r.isAlwaysFalse() && isEquivalent(simplifiedCond2, r)) {
         List<RexNode> conjs = RelOptUtil.conjunctions(r);
         for (RexNode e : RelOptUtil.conjunctions(target2)) {
           removeAll(conjs, e);