commit 5c74b6b41c33af466c0b1798101d84df56138725
author Minji Kim <minji@dremio.com> Thu Jul 28 16:22:43 2016 -0700
committer Julian Hyde <jhyde@apache.org> Sat Jul 30 11:47:31 2016 -0700
tree 1c441e6bd1dcbd91ed4808bc968696a77455978f
parent 6d56222dab93551d357076d158cb03ca479b3bbd

[CALCITE-1043] RelOptUtil should check SqlKind instead of operator instance (Minji Kim)

Close apache/calcite#262

core/src/main/java/org/apache/calcite/plan/RelOptUtil.java

diff --git a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
index d9d2a63..0340b1b 100644
--- a/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
+++ b/core/src/main/java/org/apache/calcite/plan/RelOptUtil.java
@@ -1263,7 +1263,7 @@
       List<RexNode> nonEquiList) {
     if (condition instanceof RexCall) {
       RexCall call = (RexCall) condition;
-      if (call.getOperator() == SqlStdOperatorTable.AND) {
+      if (call.getOperator().getKind() == SqlKind.AND) {
         for (RexNode operand : call.getOperands()) {
           splitCorrelatedFilterCondition(
               filter,
@@ -1275,7 +1275,7 @@
         return;
       }
 
-      if (call.getOperator() == SqlStdOperatorTable.EQUALS) {
+      if (call.getOperator().getKind() == SqlKind.EQUALS) {
         final List<RexNode> operands = call.getOperands();
         RexNode op0 = operands.get(0);
         RexNode op1 = operands.get(1);
@@ -1310,7 +1310,7 @@
       boolean extractCorrelatedFieldAccess) {
     if (condition instanceof RexCall) {
       RexCall call = (RexCall) condition;
-      if (call.getOperator() == SqlStdOperatorTable.AND) {
+      if (call.getOperator().getKind() == SqlKind.AND) {
         for (RexNode operand : call.getOperands()) {
           splitCorrelatedFilterCondition(
               filter,
@@ -1323,7 +1323,7 @@
         return;
       }
 
-      if (call.getOperator() == SqlStdOperatorTable.EQUALS) {
+      if (call.getOperator().getKind() == SqlKind.EQUALS) {
         final List<RexNode> operands = call.getOperands();
         RexNode op0 = operands.get(0);
         RexNode op1 = operands.get(1);