Skip to content

[CALCITE-3651] NPE when convert relational algebra that correlates TableFunctionScan #1711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hsyuan merged 1 commit into from
Jan 3, 2020
Merged

[CALCITE-3651] NPE when convert relational algebra that correlates TableFunctionScan #1711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,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);
}

/**
Expand Down
13 changes: 13 additions & 0 deletions core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down