phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject phoenix git commit: PHOENIX-1646 Views and functional index expressions may lose information when stringified
Date Tue, 10 Feb 2015 09:58:37 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master 2730e874d -> acb87990d


PHOENIX-1646 Views and functional index expressions may lose information when stringified


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

Branch: refs/heads/master
Commit: acb87990d81bfc60bba0f511957c18e1a12b4da3
Parents: 2730e87
Author: James Taylor <jtaylor@salesforce.com>
Authored: Tue Feb 10 01:58:29 2015 -0800
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Tue Feb 10 01:58:29 2015 -0800

----------------------------------------------------------------------
 .../apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java  | 4 ++--
 .../it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/acb87990/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
index 932c68b..e4ba2c6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java
@@ -322,8 +322,8 @@ public class GlobalIndexOptimizationIT extends BaseHBaseManagedTimeIT
{
                     "    SERVER FILTER BY V1 = 'a'\n" +
                     "    SKIP-SCAN-JOIN TABLE 0\n" +
                     "        CLIENT PARALLEL 1-WAY SKIP SCAN ON 2 KEYS OVER _IDX_T \\[-32768,1\\]
- \\[-32768,2\\]\n" +
-                    "            SERVER FILTER BY FIRST KEY ONLY AND \"K2\" IN (3,4)\n" +
-                    "    DYNAMIC SERVER FILTER BY (\"T_ID\", \"K1\", \"K2\") IN \\(\\(\\$\\d+.\\$\\d+,
\\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+\\)\\)";
+                    "            SERVER FILTER BY FIRST KEY ONLY AND \"K2\" IN \\(3,4\\)\n"
+
+                    "    DYNAMIC SERVER FILTER BY \\(\"T_ID\", \"K1\", \"K2\"\\) IN \\(\\(\\$\\d+.\\$\\d+,
\\$\\d+.\\$\\d+, \\$\\d+.\\$\\d+\\)\\)";
             assertTrue("Expected:\n" + expected + "\ndid not match\n" + actual, Pattern.matches(expected,actual));
             
             rs = conn1.createStatement().executeQuery(query);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/acb87990/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
index 9e66bbf..4080730 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
@@ -471,7 +471,7 @@ public class LocalIndexIT extends BaseHBaseManagedTimeIT {
                 "CLIENT PARALLEL " + numRegions + "-WAY RANGE SCAN OVER "
                         + MetaDataUtil.getLocalIndexTableName(TestUtil.DEFAULT_DATA_TABLE_NAME)+"
[-32768,*] - [-32768,'z']\n"
                         + "    SERVER FILTER BY FIRST KEY ONLY\n"
-                        + "    SERVER AGGREGATE INTO DISTINCT ROWS BY [\"V1\", \"T_ID\",
\"K3\"]\n" + "CLIENT MERGE SORT",
+                        + "    SERVER AGGREGATE INTO DISTINCT ROWS BY [\"V1\", \"T_ID\",
K3]\n" + "CLIENT MERGE SORT",
                 QueryUtil.getExplainPlan(rs));
             
             rs = conn1.createStatement().executeQuery(query);


Mime
View raw message