[CALCITE-4188] Add hints from review

sap-contributions · Jan 10, 2025 · 9e5755b · 9e5755b
1 parent 0ef6249
commit 9e5755b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContext.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcCorrelationDataContext.java
@@ -23,6 +23,8 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static java.lang.Integer.parseInt;
+
 /**
  * A special DataContext which handles correlation variable for batch nested loop joins.
  */
@@ -36,6 +38,7 @@ public JdbcCorrelationDataContext(DataContext delegate, Object[] parameters) {
     this.delegate = delegate;
     this.parameters = parameters;
   }
+
   @Override public @Nullable SchemaPlus getRootSchema() {
     return delegate.getRootSchema();
   }
@@ -50,7 +53,7 @@ public JdbcCorrelationDataContext(DataContext delegate, Object[] parameters) {
 
   @Override public @Nullable Object get(String name) {
     if (name.startsWith("?")) {
-      int index = Integer.parseInt(name.substring(1));
+      int index = parseInt(name.substring(1));
       if (index >= OFFSET && index < OFFSET + parameters.length) {
         return parameters[index - OFFSET];
       }

diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcImplementor.java
@@ -65,6 +65,8 @@ public Result implement(RelNode node) {
       return context;
     }
     List<RelDataTypeField>  fieldList = variable.getType().getFieldList();
+    // We need to provide a context which also includes the correlation variables
+    // as dynamic parameters.
     return new Context(dialect, fieldList.size()) {
       @Override public SqlNode field(int ordinal) {
         RelDataTypeField field = fieldList.get(ordinal);

diff --git a/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java b/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
@@ -1431,6 +1431,10 @@ private LockWrapper exclusiveCleanDb(Connection c) throws SQLException {
         .runs();
   }
 
+  /**
+   * Test case for
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-4188">[CALCITE-4188]
+   * Support EnumerableBatchNestedLoopJoin for JDBC</a>. */
   @Test void testBatchNestedLoopJoinPlan() {
     final String sql = "SELECT *\n"
         + "FROM \"s\".\"emps\" A\n"