KE-11534 [Follow up]KE-42040 revert changes in JoinInfo

Kyligence · Aug 25, 2023 · c24cdda · c24cdda
1 parent 797a81d
commit c24cdda
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/core/src/main/java/org/apache/calcite/rel/core/JoinInfo.java b/core/src/main/java/org/apache/calcite/rel/core/JoinInfo.java
@@ -46,9 +46,6 @@ public class JoinInfo {
   public final ImmutableIntList leftKeys;
   public final ImmutableIntList rightKeys;
   public final ImmutableList<RexNode> nonEquiConditions;
-  // see https://olapio.atlassian.net/browse/KE-42040
-  // Calcite 1.30 remove EquiJoinInfo and NonEquiJoinInfo, but we need rexbuilder
-  private static RexBuilder nonEquiJoinInfoBuilder = null;
 
   /** Creates a JoinInfo. */
   protected JoinInfo(ImmutableIntList leftKeys, ImmutableIntList rightKeys,
@@ -65,7 +62,6 @@ public static JoinInfo of(RelNode left, RelNode right, RexNode condition) {
     final List<Integer> rightKeys = new ArrayList<>();
     final List<Boolean> filterNulls = new ArrayList<>();
     final List<RexNode> nonEquiList = new ArrayList<>();
-    nonEquiJoinInfoBuilder = left.getCluster().getRexBuilder();
     RelOptUtil.splitJoinCondition(left, right, condition, leftKeys, rightKeys,
         filterNulls, nonEquiList);
     return new JoinInfo(ImmutableIntList.copyOf(leftKeys),
@@ -98,9 +94,6 @@ public ImmutableBitSet rightSet() {
 
   @Deprecated // to be removed before 2.0
   public RexNode getRemaining(RexBuilder rexBuilder) {
-    if (rexBuilder == null) {
-      rexBuilder = nonEquiJoinInfoBuilder;
-    }
     return RexUtil.composeConjunction(rexBuilder, nonEquiConditions);
   }