From 27cfe6f46be223c34a7399f2e2d6b7597c1213a0 Mon Sep 17 00:00:00 2001 From: zhuangdy Date: Mon, 28 Oct 2019 17:56:06 +0800 Subject: [PATCH 1/2] [CALCITE-3449] sync the table name logic from TableScan into the TableModify --- .../rel/rel2sql/RelToSqlConverter.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 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 index e4618c808b37..093821f1733a 100644 --- a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java +++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java @@ -18,10 +18,7 @@ import org.apache.calcite.adapter.jdbc.JdbcTable; import org.apache.calcite.linq4j.tree.Expressions; -import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollations; -import org.apache.calcite.rel.RelFieldCollation; -import org.apache.calcite.rel.RelNode; +import org.apache.calcite.rel.*; import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Calc; @@ -398,16 +395,7 @@ private SqlNode groupItem(List 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 qualifiedName = e.getTable().getQualifiedName(); - identifier = new SqlIdentifier(qualifiedName, SqlParserPos.ZERO); - } + final SqlIdentifier identifier = getSqlTargetTable(e); return result(identifier, ImmutableList.of(Clause.FROM), e, null); } @@ -652,14 +640,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 qualifiedName = e.getTable().getQualifiedName(); + sqlTargetTable = new SqlIdentifier(qualifiedName, SqlParserPos.ZERO); + } + + return sqlTargetTable; + } + /** @see #dispatch */ public Result visit(TableModify modify) { final Map 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); switch (modify.getOperation()) { case INSERT: { From 8fb9c03bfb43a3a5119ba35adf5052267a4a9e4d Mon Sep 17 00:00:00 2001 From: zhuangdy Date: Mon, 28 Oct 2019 18:08:59 +0800 Subject: [PATCH 2/2] sorry for ideaj auto modify the imports --- .../org/apache/calcite/rel/rel2sql/RelToSqlConverter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 index 093821f1733a..074471d9f256 100644 --- a/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java +++ b/core/src/main/java/org/apache/calcite/rel/rel2sql/RelToSqlConverter.java @@ -18,7 +18,10 @@ import org.apache.calcite.adapter.jdbc.JdbcTable; import org.apache.calcite.linq4j.tree.Expressions; -import org.apache.calcite.rel.*; +import org.apache.calcite.rel.RelCollation; +import org.apache.calcite.rel.RelCollations; +import org.apache.calcite.rel.RelFieldCollation; +import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Calc;