[9/9] phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9bb7811f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9bb7811f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9bb7811f Branch: refs/heads/4.x-HBase-0.98 Commit: 9bb7811f001d00cea42da6185c3645d7d14e4a16 Parents: babda32 Author: maryannxueAuthored: Fri Feb 16 21:03:46 2018 -0800 Committer: maryannxue Committed: Tue Mar 13 21:31:58 2018 -0700 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 3 files changed, 10 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bb7811f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bb7811f/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -795,7 +795,7 @@ public class HashJoinMoreIT extends
[9/9] phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c65c81a4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c65c81a4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c65c81a4 Branch: refs/heads/4.x-HBase-1.1 Commit: c65c81a47a65127a60886a984378c268598fd2e0 Parents: eafcdd1 Author: maryannxueAuthored: Fri Feb 16 21:03:46 2018 -0800 Committer: maryannxue Committed: Tue Mar 13 17:02:13 2018 -0700 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c65c81a4/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/c65c81a4/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@
[6/9] phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8162813f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8162813f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8162813f Branch: refs/heads/4.x-HBase-1.1 Commit: 8162813ffac3003dc70dca5c40a3386ea7a1cbbc Parents: adbce12 Author: maryannxueAuthored: Fri Feb 16 21:03:46 2018 -0800 Committer: maryannxue Committed: Tue Mar 13 16:55:16 2018 -0700 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8162813f/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/8162813f/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@
phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 11308c8aa -> 6cadbab92 PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6cadbab9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6cadbab9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6cadbab9 Branch: refs/heads/5.x-HBase-2.0 Commit: 6cadbab92f5b063c0cf6e07f36175f0475260aad Parents: 11308c8 Author: maryannxueAuthored: Fri Feb 16 21:03:46 2018 -0800 Committer: maryannxue Committed: Mon Feb 19 23:08:47 2018 -0800 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6cadbab9/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6cadbab9/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + "
[2/2] phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/556b0544 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/556b0544 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/556b0544 Branch: refs/heads/4.x-cdh5.11.2 Commit: 556b05443a7171524e6f8a39a8dd187608788970 Parents: 4d1954e Author: maryannxueAuthored: Sat Feb 17 05:02:58 2018 + Committer: Pedro Boado Committed: Sat Feb 17 14:17:38 2018 + -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/556b0544/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/556b0544/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@
phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 39301abca -> 9e5fdab02 PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9e5fdab0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9e5fdab0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9e5fdab0 Branch: refs/heads/4.x-HBase-1.3 Commit: 9e5fdab0282701f54bf5ec6d6fc21ea97d4ac7b4 Parents: 39301ab Author: maryannxueAuthored: Fri Feb 16 21:04:16 2018 -0800 Committer: maryannxue Committed: Fri Feb 16 21:04:16 2018 -0800 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9e5fdab0/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/9e5fdab0/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + "
phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 4ea0663d3 -> d4c04fae9 PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d4c04fae Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d4c04fae Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d4c04fae Branch: refs/heads/4.x-HBase-1.2 Commit: d4c04fae9b83691bf298882f04113012285e8d5d Parents: 4ea0663 Author: maryannxueAuthored: Fri Feb 16 21:02:58 2018 -0800 Committer: maryannxue Committed: Fri Feb 16 21:02:58 2018 -0800 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d4c04fae/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/d4c04fae/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + "
phoenix git commit: PHOENIX-4611 Not nullable column impact on join query plans
Repository: phoenix Updated Branches: refs/heads/master 4eed109b4 -> 10109d55d PHOENIX-4611 Not nullable column impact on join query plans Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/10109d55 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/10109d55 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/10109d55 Branch: refs/heads/master Commit: 10109d55d4e8d4c69da53fb02e6c9b98d7721ea1 Parents: 4eed109 Author: maryannxueAuthored: Fri Feb 16 21:03:46 2018 -0800 Committer: maryannxue Committed: Fri Feb 16 21:03:46 2018 -0800 -- .../java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java | 8 .../java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java | 4 ++-- .../main/java/org/apache/phoenix/compile/JoinCompiler.java | 4 .../org/apache/phoenix/compile/TupleProjectionCompiler.java | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/10109d55/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java index a132728..dea349a 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinMoreIT.java @@ -440,8 +440,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [BUCKET, \"TIMESTAMP\"]\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]" +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]" : "SORT-MERGE-JOIN (INNER) TABLES\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + eventCountTableName + " [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + @@ -456,8 +456,8 @@ public class SortMergeJoinMoreIT extends ParallelStatsDisabledIT { "SERVER DISTINCT PREFIX FILTER OVER [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [BUCKET, \"TIMESTAMP\", SRC_LOCATION, DST_LOCATION]\n" + "CLIENT MERGE SORT\n" + -"CLIENT SORTED BY [E.BUCKET, E.TIMESTAMP]\n" + -"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, E.TIMESTAMP]"; +"CLIENT SORTED BY [E.TIMESTAMP, E.BUCKET]\n" + +"CLIENT AGGREGATE INTO DISTINCT ROWS BY [E.TIMESTAMP, E.BUCKET]"; ResultSet rs = conn.createStatement().executeQuery("explain " + q); assertEquals(p, QueryUtil.getExplainPlan(rs)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/10109d55/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java index f09f1d3..3a1b015 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java @@ -786,7 +786,7 @@ public class HashJoinMoreIT extends ParallelStatsDisabledIT { String p = i == 0 ? "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER EVENT_COUNT [0,'5SEC',~14629935200,'Tr/Bal'] - [1,'5SEC',~14629934200,'Tr/Bal']\n" + "SERVER FILTER BY FIRST KEY ONLY\n" + -"SERVER AGGREGATE INTO DISTINCT ROWS BY [E.BUCKET, \"E.TIMESTAMP\"]\n" + +"SERVER AGGREGATE INTO DISTINCT ROWS BY [\"E.TIMESTAMP\", E.BUCKET]\n" + "CLIENT MERGE SORT\n" + "PARALLEL INNER-JOIN TABLE 0 (SKIP MERGE)\n" + "CLIENT PARALLEL 2-WAY SKIP SCAN ON 2 RANGES OVER " + t[i] + "