[CALCITE-3651] NPE when convert relational algebra that correlates Ta…

…bleFunctionScan (Wang Yanlin)
apache · Jan 3, 2020 · 3dd6d85 · 3dd6d85
1 parent 7dcceee
commit 3dd6d85
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
@@ -881,9 +881,7 @@ public Result visit(TableFunctionScan e) {
     SqlNode select = new SqlSelect(
         SqlParserPos.ZERO, null, null, tableCall,
         null, null, null, null, null, null, null, SqlNodeList.EMPTY);
-    Result x = new Result(select,
-        ImmutableList.of(Clause.SELECT), null, e.getRowType(), null);
-    return x;
+    return result(select, ImmutableList.of(Clause.SELECT), e, null);
   }
 
   /**

diff --git a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
@@ -3734,6 +3734,19 @@ private void checkLiteral2(String expression, String expected) {
     sql(sql).ok(expected);
   }
 
+  /** Test case for
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-3651">[CALCITE-3651]
+   * NullPointerException when convert relational algebra that correlates TableFunctionScan</a>. */
+  @Test public void testLateralCorrelate() {
+    final String query = "select * from \"product\",\n"
+        + "lateral table(RAMP(\"product\".\"product_id\"))";
+    final String expected = "SELECT *\n"
+        + "FROM \"foodmart\".\"product\" AS \"$cor0\",\n"
+        + "LATERAL (SELECT *\n"
+        + "FROM TABLE(RAMP(\"$cor0\".\"product_id\"))) AS \"t\"";
+    sql(query).ok(expected);
+  }
+
   @Test public void testUncollectExplicitAlias() {
     final String sql = "select did + 1 \n"
         + "from unnest(select collect(\"department_id\") as deptid"