phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maryann...@apache.org
Subject phoenix git commit: Update test ref based on latest Calcite master
Date Tue, 03 Nov 2015 03:44:35 GMT
Repository: phoenix
Updated Branches:
  refs/heads/calcite 926cf7827 -> be86248f5


Update test ref based on latest Calcite master


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/be86248f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/be86248f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/be86248f

Branch: refs/heads/calcite
Commit: be86248f5598f52bdd2cd43b865c0f427b5e8959
Parents: 926cf78
Author: maryannxue <wei.xue@intel.com>
Authored: Mon Nov 2 22:44:22 2015 -0500
Committer: maryannxue <wei.xue@intel.com>
Committed: Mon Nov 2 22:44:22 2015 -0500

----------------------------------------------------------------------
 .../src/it/java/org/apache/phoenix/calcite/CalciteIT.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/be86248f/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 385ebaf..5b32383 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
@@ -1500,7 +1500,8 @@ public class CalciteIT extends BaseClientManagedTimeIT {
                            "    PhoenixServerJoin(condition=[AND(=($0, $4), =($1, $5))],
joinType=[inner])\n" +
                            "      PhoenixTableScan(table=[[phoenix, SALTED_TEST_TABLE]],
filter=[>($0, 1)])\n" +
                            "      PhoenixToClientConverter\n" +
-                           "        PhoenixTableScan(table=[[phoenix, SALTED_TEST_TABLE]],
filter=[<($3, 6)])\n")
+                           "        PhoenixServerProject(MYPK0=[$1], MYPK1=[$2], COL0=[$3],
COL1=[CAST($0):INTEGER])\n" +
+                           "          PhoenixTableScan(table=[[phoenix, IDXSALTED_SALTED_TEST_TABLE]],
filter=[<(CAST($0):INTEGER, 6)])\n")
                 .resultIs(new Object[][] {
                         {2, 3, 4, 5, 2, 3, 4, 5}})
                 .close();


Mime
View raw message