Skip to content

[CALCITE-3449] Sync tableName logic from TableScan into TableModify #1541

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

Closed
pinkdawn wants to merge 2 commits into from
Closed

[CALCITE-3449] Sync tableName logic from TableScan into TableModify #1541

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27cfe6f
[CALCITE-3449] sync the table name logic from TableScan into the Tabl…
Oct 28, 2019
8fb9c03
sorry for ideaj auto modify the imports
Oct 28, 2019
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
29 changes: 17 additions & 12 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 @@ -398,16 +398,7 @@ private SqlNode groupItem(List<SqlNode> groupKeys,

/** @see #dispatch */
public Result visit(TableScan e) {
final SqlIdentifier identifier;
final JdbcTable jdbcTable = e.getTable().unwrap(JdbcTable.class);
if (jdbcTable != null) {
// Use the foreign catalog, schema and table names, if they exist,
// rather than the qualified name of the shadow table in Calcite.
identifier = jdbcTable.tableName();
} else {
final List<String> qualifiedName = e.getTable().getQualifiedName();
identifier = new SqlIdentifier(qualifiedName, SqlParserPos.ZERO);
}
final SqlIdentifier identifier = getSqlTargetTable(e);
return result(identifier, ImmutableList.of(Clause.FROM), e, null);
}

Expand Down Expand Up @@ -652,14 +643,28 @@ public boolean hasTrickyRollup(Sort e, Aggregate aggregate) {
fc.getFieldIndex() < aggregate.getGroupSet().cardinality());
}

private SqlIdentifier getSqlTargetTable(RelNode e) {
final SqlIdentifier sqlTargetTable;
final JdbcTable jdbcTable = e.getTable().unwrap(JdbcTable.class);
if (jdbcTable != null) {
// Use the foreign catalog, schema and table names, if they exist,
// rather than the qualified name of the shadow table in Calcite.
sqlTargetTable = jdbcTable.tableName();
} else {
final List<String> qualifiedName = e.getTable().getQualifiedName();
sqlTargetTable = new SqlIdentifier(qualifiedName, SqlParserPos.ZERO);
}

return sqlTargetTable;
Copy link
Contributor

@danny0405 danny0405 Oct 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, the code looks good, can you add a test case in RelToSqlConverterTest ?

}

/** @see #dispatch */
public Result visit(TableModify modify) {
final Map<String, RelDataType> pairs = ImmutableMap.of();
final Context context = aliasContext(pairs, false);

// Target Table Name
final SqlIdentifier sqlTargetTable =
new SqlIdentifier(modify.getTable().getQualifiedName(), POS);
final SqlIdentifier sqlTargetTable = getSqlTargetTable(modify);
Copy link
Contributor

@jinxing64 jinxing64 Oct 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 for this fix ~


switch (modify.getOperation()) {
case INSERT: {
Expand Down