You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2015/09/03 21:20:46 UTC
phoenix git commit: Update calcite dependence to 1.5.0-incubating;
update test case references accordingly.
Repository: phoenix
Updated Branches:
refs/heads/calcite 1f5ee4fcc -> b646ca45f
Update calcite dependence to 1.5.0-incubating; update test case references accordingly.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b646ca45
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b646ca45
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b646ca45
Branch: refs/heads/calcite
Commit: b646ca45f2ccb24d5859be2e6475bfd0baaa6fe4
Parents: 1f5ee4f
Author: maryannxue <we...@intel.com>
Authored: Thu Sep 3 15:20:32 2015 -0400
Committer: maryannxue <we...@intel.com>
Committed: Thu Sep 3 15:20:32 2015 -0400
----------------------------------------------------------------------
.../it/java/org/apache/phoenix/calcite/CalciteIT.java | 11 +++++------
pom.xml | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b646ca45/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 60fa6ea..6b4c574 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
@@ -527,7 +527,7 @@ public class CalciteIT extends BaseClientManagedTimeIT {
// Join key being order-by fields with the other side sorted on order-by fields
start().sql("SELECT item.\"item_id\", item.name, supp.\"supplier_id\", supp.name FROM " + JOIN_ITEM_TABLE_FULL_NAME + " item JOIN " + JOIN_SUPPLIER_TABLE_FULL_NAME + " supp ON item.\"supplier_id\" = supp.\"supplier_id\" order by item.\"supplier_id\"")
.explainIs("PhoenixToEnumerableConverter\n" +
- " PhoenixClientProject(item_id=[$0], NAME=[$1], supplier_id=[$3], NAME0=[$4])\n" +
+ " PhoenixClientProject(item_id=[$0], NAME=[$1], supplier_id=[$3], NAME0=[$4], supplier_id0=[$2])\n" +
" PhoenixClientJoin(condition=[=($2, $3)], joinType=[inner])\n" +
" PhoenixServerSort(sort0=[$2], dir0=[ASC])\n" +
" PhoenixServerProject(item_id=[$0], NAME=[$1], supplier_id=[$5])\n" +
@@ -952,15 +952,14 @@ public class CalciteIT extends BaseClientManagedTimeIT {
start.sql("select a_string from aTable order by organization_id")
.explainIs("PhoenixToEnumerableConverter\n" +
" PhoenixToClientConverter\n" +
- " PhoenixServerProject(A_STRING=[$2])\n" +
+ " PhoenixServerProject(A_STRING=[$2], ORGANIZATION_ID=[$0])\n" +
" PhoenixTableScan(table=[[phoenix, ATABLE]])\n")
.close();
start.sql("select a_integer from aTable order by a_string")
.explainIs("PhoenixToEnumerableConverter\n" +
- " PhoenixClientProject(A_INTEGER=[$0])\n" +
- " PhoenixServerSort(sort0=[$1], dir0=[ASC])\n" +
- " PhoenixServerProject(A_INTEGER=[$4], A_STRING=[$2])\n" +
- " PhoenixTableScan(table=[[phoenix, ATABLE]])\n")
+ " PhoenixServerSort(sort0=[$1], dir0=[ASC])\n" +
+ " PhoenixServerProject(A_INTEGER=[$4], A_STRING=[$2])\n" +
+ " PhoenixTableScan(table=[[phoenix, ATABLE]])\n")
.close();
start.sql("select a_string, b_string from aTable where a_string = 'a'")
.explainIs("PhoenixToEnumerableConverter\n" +
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b646ca45/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c291adf..38acce1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<collections.version>3.2.1</collections.version>
<jodatime.version>2.7</jodatime.version>
<joni.version>2.1.2</joni.version>
- <calcite.version>1.4.0-incubating-SNAPSHOT</calcite.version>
+ <calcite.version>1.5.0-incubating-SNAPSHOT</calcite.version>
<!-- Test Dependencies -->
<mockito-all.version>1.8.5</mockito-all.version>