You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2016/05/25 17:26:08 UTC
calcite git commit: [CALCITE-1245] Allow RelBuilder.scan to take
qualified table name (Chris Baynes)
Repository: calcite
Updated Branches:
refs/heads/master f191a386a -> b76affcce
[CALCITE-1245] Allow RelBuilder.scan to take qualified table name (Chris Baynes)
Close apache/calcite#237
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/b76affcc
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/b76affcc
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/b76affcc
Branch: refs/heads/master
Commit: b76affccec5756d7d1f6cf76cf4c2344a28fcfeb
Parents: f191a38
Author: Chris Baynes <bi...@gmail.com>
Authored: Tue May 24 15:04:41 2016 +0200
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed May 25 09:41:08 2016 -0700
----------------------------------------------------------------------
.../org/apache/calcite/tools/PigRelBuilder.java | 8 +++-
.../org/apache/calcite/tools/RelBuilder.java | 26 +++++++++---
.../org/apache/calcite/test/RelBuilderTest.java | 42 ++++++++++++++++++++
3 files changed, 68 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/b76affcc/core/src/main/java/org/apache/calcite/tools/PigRelBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/tools/PigRelBuilder.java b/core/src/main/java/org/apache/calcite/tools/PigRelBuilder.java
index be62155..644525a 100644
--- a/core/src/main/java/org/apache/calcite/tools/PigRelBuilder.java
+++ b/core/src/main/java/org/apache/calcite/tools/PigRelBuilder.java
@@ -49,8 +49,12 @@ public class PigRelBuilder extends RelBuilder {
relBuilder.relOptSchema);
}
- @Override public PigRelBuilder scan(String tableName) {
- return (PigRelBuilder) super.scan(tableName);
+ @Override public PigRelBuilder scan(String... tableNames) {
+ return (PigRelBuilder) super.scan(tableNames);
+ }
+
+ @Override public PigRelBuilder scan(Iterable<String> tableNames) {
+ return (PigRelBuilder) super.scan(tableNames);
}
/** Loads a data set.
http://git-wip-us.apache.org/repos/asf/calcite/blob/b76affcc/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/tools/RelBuilder.java b/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
index 414f1ca..acc9363 100644
--- a/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
+++ b/core/src/main/java/org/apache/calcite/tools/RelBuilder.java
@@ -64,6 +64,7 @@ import org.apache.calcite.util.mapping.Mapping;
import org.apache.calcite.util.mapping.Mappings;
import com.google.common.base.Function;
+import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -663,23 +664,36 @@ public class RelBuilder {
/** Creates a {@link org.apache.calcite.rel.core.TableScan} of the table
* with a given name.
*
- * <p>Throws if the table does not exist within the current schema.
+ * <p>Throws if the table does not exist.
*
* <p>Returns this builder.
*
- * @param tableName Name of table
+ * @param tableNames Name of table (can optionally be qualified)
*/
- public RelBuilder scan(String tableName) {
- final RelOptTable relOptTable =
- relOptSchema.getTableForMember(ImmutableList.of(tableName));
+ public RelBuilder scan(Iterable<String> tableNames) {
+ final List<String> names = ImmutableList.copyOf(tableNames);
+ final RelOptTable relOptTable = relOptSchema.getTableForMember(names);
if (relOptTable == null) {
- throw Static.RESOURCE.tableNotFound(tableName).ex();
+ throw Static.RESOURCE.tableNotFound(Joiner.on(".").join(names)).ex();
}
final RelNode scan = scanFactory.createScan(cluster, relOptTable);
push(scan);
return this;
}
+ /** Creates a {@link org.apache.calcite.rel.core.TableScan} of the table
+ * with a given name.
+ *
+ * <p>Throws if the table does not exist.
+ *
+ * <p>Returns this builder.
+ *
+ * @param tableNames Name of table (can optionally be qualified)
+ */
+ public RelBuilder scan(String... tableNames) {
+ return scan(ImmutableList.copyOf(tableNames));
+ }
+
/** Creates a {@link org.apache.calcite.rel.core.Filter} of an array of
* predicates.
*
http://git-wip-us.apache.org/repos/asf/calcite/blob/b76affcc/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java b/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
index 8a164c5..e6ea995 100644
--- a/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelBuilderTest.java
@@ -121,6 +121,18 @@ public class RelBuilderTest {
is("LogicalTableScan(table=[[scott, EMP]])\n"));
}
+ @Test public void testScanQualifiedTable() {
+ // Equivalent SQL:
+ // SELECT *
+ // FROM "scott"."emp"
+ final RelNode root =
+ RelBuilder.create(config().build())
+ .scan("scott", "EMP")
+ .build();
+ assertThat(str(root),
+ is("LogicalTableScan(table=[[scott, EMP]])\n"));
+ }
+
@Test public void testScanInvalidTable() {
// Equivalent SQL:
// SELECT *
@@ -136,6 +148,36 @@ public class RelBuilderTest {
}
}
+ @Test public void testScanInvalidSchema() {
+ // Equivalent SQL:
+ // SELECT *
+ // FROM "zzz"."emp"
+ try {
+ final RelNode root =
+ RelBuilder.create(config().build())
+ .scan("ZZZ", "EMP") // the table exists, but the schema does not
+ .build();
+ fail("expected error, got " + root);
+ } catch (Exception e) {
+ assertThat(e.getMessage(), is("Table 'ZZZ.EMP' not found"));
+ }
+ }
+
+ @Test public void testScanInvalidQualifiedTable() {
+ // Equivalent SQL:
+ // SELECT *
+ // FROM "scott"."zzz"
+ try {
+ final RelNode root =
+ RelBuilder.create(config().build())
+ .scan("scott", "ZZZ") // the schema is valid, but the table does not exist
+ .build();
+ fail("expected error, got " + root);
+ } catch (Exception e) {
+ assertThat(e.getMessage(), is("Table 'scott.ZZZ' not found"));
+ }
+ }
+
@Test public void testScanValidTableWrongCase() {
// Equivalent SQL:
// SELECT *