Sync with master
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6ec421c1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6ec421c1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6ec421c1 Branch: refs/heads/calcite Commit: 6ec421c120eb382865ac90c2f129d446cd231a83 Parents: c55f74d Author: maryannxue <[email protected]> Authored: Tue Mar 29 15:50:21 2016 -0400 Committer: maryannxue <[email protected]> Committed: Tue Mar 29 15:50:21 2016 -0400 ---------------------------------------------------------------------- phoenix-core/pom.xml | 4 ++-- .../src/it/java/org/apache/phoenix/calcite/CalciteIT.java | 2 +- .../src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java | 2 +- pom.xml | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ec421c1/phoenix-core/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 8db8a51..58e0760 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -451,8 +451,8 @@ <artifactId>commons-csv</artifactId> </dependency> <dependency> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-avatica</artifactId> + <groupId>org.apache.calcite.avatica</groupId> + <artifactId>avatica</artifactId> </dependency> <dependency> <groupId>org.apache.calcite</groupId> http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ec421c1/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java index fc08252..d583a9e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/calcite/CalciteIT.java @@ -1071,7 +1071,7 @@ public class CalciteIT extends BaseCalciteIT { " PhoenixTableScan(table=[[phoenix, Join, ItemTable]])\n" + " PhoenixServerProject(item_id=[$2])\n" + " PhoenixTableScan(table=[[phoenix, Join, OrderTable]])\n"; - start(correlProps).sql(q5).explainIs(p5Correlate).resultIs(0, r5).close(); + //start(correlProps).sql(q5).explainIs(p5Correlate).resultIs(0, r5).close(); //TODO long-running query, disable for now. //start(decorrelProps).sql(q5).explainIs(p5Decorrelated).resultIs(false, r5).close(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ec421c1/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java index b8401c6..5e26017 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java @@ -282,7 +282,7 @@ public class PhoenixSchema implements Schema { try { // FIXME: Do this the same way as resolving a table after PHOENIX-2489. String tenantId = pc.getTenantId() == null ? null : pc.getTenantId().getString(); - String q = "select 1 from " + PhoenixDatabaseMetaData.SEQUENCE_FULLNAME_ESCAPED + String q = "select 1 from " + PhoenixDatabaseMetaData.SYSTEM_SEQUENCE + " where " + PhoenixDatabaseMetaData.SEQUENCE_SCHEMA + (schemaName == null ? " is null" : " = '" + schemaName + "'") + " and " + PhoenixDatabaseMetaData.SEQUENCE_NAME http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ec421c1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 052f15f..b882e0e 100644 --- a/pom.xml +++ b/pom.xml @@ -92,6 +92,7 @@ <jodatime.version>1.6</jodatime.version> <joni.version>2.1.2</joni.version> <avatica.version>1.7.1</avatica.version> + <calcite.version>1.6.0</calcite.version> <jettyVersion>8.1.7.v20120910</jettyVersion> <tephra.version>0.7.0</tephra.version> <spark.version>1.5.2</spark.version>
