Bump to Calcite 1.37

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWindowRelBase.java

@@ -37,4 +37,9 @@ public DrillWindowRelBase(
       List<Group> windows) {
     super(cluster, traits, child, constants, DrillRelOptUtil.uniqifyFieldName(rowType, cluster.getTypeFactory()), windows);
   }
+
+  @Override
+  public Window copy(List<RexLiteral> constants) {
+    return new DrillWindowRelBase(getCluster(), traitSet, getInput(), constants, getRowType(), groups);
+  }
 }

exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillConvertletTable.java

@@ -34,8 +34,8 @@
 import org.apache.calcite.sql.SqlLiteral;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNumericLiteral;
+import org.apache.calcite.sql.SqlBasicFunction;
 import org.apache.calcite.sql.SqlOperator;
-import org.apache.calcite.sql.fun.SqlRandFunction;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.type.SqlTypeName;
@@ -154,12 +154,9 @@ private static SqlRexConvertlet randConvertlet() {
       List<RexNode> operands = call.getOperandList().stream()
         .map(cx::convertExpression)
         .collect(Collectors.toList());
-      return cx.getRexBuilder().makeCall(new SqlRandFunction() {
-        @Override
-        public boolean isDeterministic() {
-          return false;
-        }
-      }, operands);
+      // In Calcite 1.37+, RAND is a SqlBasicFunction, use withDeterministic(false) to mark it as non-deterministic
+      SqlBasicFunction nonDeterministicRand = ((SqlBasicFunction) SqlStdOperatorTable.RAND).withDeterministic(false);
+      return cx.getRexBuilder().makeCall(nonDeterministicRand, operands);
     };
   }
 

exec/java-exec/src/main/java/org/apache/drill/exec/store/enumerable/plan/JdbcExpressionCheck.java

@@ -23,6 +23,8 @@
 import org.apache.calcite.rex.RexFieldAccess;
 import org.apache.calcite.rex.RexFieldCollation;
 import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexLambda;
+import org.apache.calcite.rex.RexLambdaRef;
 import org.apache.calcite.rex.RexLiteral;
 import org.apache.calcite.rex.RexLocalRef;
 import org.apache.calcite.rex.RexNode;
@@ -132,4 +134,16 @@ public Boolean visitTableInputRef(RexTableInputRef fieldRef) {
   public Boolean visitPatternFieldRef(RexPatternFieldRef fieldRef) {
     return false;
   }
+
+  @Override
+  public Boolean visitLambdaRef(RexLambdaRef lambdaRef) {
+    // Lambda expressions are not supported for JDBC pushdown
+    return false;
+  }
+
+  @Override
+  public Boolean visitLambda(RexLambda lambda) {
+    // Lambda expressions are not supported for JDBC pushdown
+    return false;
+  }
 }

pom.xml

@@ -57,7 +57,7 @@
     <bouncycastle.version>1.78.1</bouncycastle.version>
     <caffeine.version>2.9.3</caffeine.version>
     <calcite.groupId>org.apache.calcite</calcite.groupId>
-    <calcite.version>1.36.0</calcite.version>
+    <calcite.version>1.37.0</calcite.version>
     <codemodel.version>2.6</codemodel.version>
     <commons.beanutils.version>1.11.0</commons.beanutils.version>
     <commons.cli.version>1.4</commons.cli.version>