phoenix git commit: PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table

[maryannxue]

Repository: phoenix
Updated Branches:
  refs/heads/master 3c2997cda -> 65d56bba6


PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table


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

Branch: refs/heads/master
Commit: 65d56bba6d8782ca0a76a30958daa059e3652f16
Parents: 3c2997c
Author: maryannxue 
Authored: Mon Sep 21 08:32:36 2015 -0400
Committer: maryannxue 
Committed: Mon Sep 21 08:32:36 2015 -0400

--
 .../apache/phoenix/end2end/SortMergeJoinIT.java | 35 ++--
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |  2 --
 .../apache/phoenix/compile/OrderByCompiler.java | 10 +++---
 .../apache/phoenix/compile/QueryCompiler.java   | 11 +++---
 4 files changed, 45 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/65d56bba/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index 8b65ab3..9b85d8a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -113,8 +113,6 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT 
{
 "AND\n" +
 "SORT-MERGE-JOIN (INNER) TABLES\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ITEM_TABLE_DISPLAY_NAME + "\n" +
-"SERVER SORTED BY [\"I.item_id\"]\n" +
-"CLIENT MERGE SORT\n" +
 "AND (SKIP MERGE)\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
 "SERVER FILTER BY QUANTITY < 5000\n" +
@@ -129,6 +127,12 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"SERVER FILTER BY FIRST KEY ONLY"
 }});
 testCases.add(new String[][] {
 {
@@ -163,6 +167,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 testCases.add(new String[][] {
 {
@@ -197,6 +213,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 return testCases;
 }
@@ -1674,6 +1702,9 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 
 

[1/2] phoenix git commit: PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table

[maryannxue]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 1f4a5400b -> 7eac78e75


PHOENIX-2274 Sort-merge join could not optimize out the sort on the right table


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

Branch: refs/heads/4.x-HBase-0.98
Commit: ea91e634400a58654ba98d8b696c169272ac8308
Parents: 6cd7936
Author: maryannxue 
Authored: Mon Sep 21 09:26:07 2015 -0400
Committer: maryannxue 
Committed: Mon Sep 21 09:26:07 2015 -0400

--
 .../apache/phoenix/end2end/SortMergeJoinIT.java | 35 ++--
 .../end2end/SubqueryUsingSortMergeJoinIT.java   |  2 --
 .../apache/phoenix/compile/OrderByCompiler.java | 10 +++---
 .../apache/phoenix/compile/QueryCompiler.java   | 11 +++---
 4 files changed, 45 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ea91e634/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
index 8b65ab3..9b85d8a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java
@@ -113,8 +113,6 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT 
{
 "AND\n" +
 "SORT-MERGE-JOIN (INNER) TABLES\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ITEM_TABLE_DISPLAY_NAME + "\n" +
-"SERVER SORTED BY [\"I.item_id\"]\n" +
-"CLIENT MERGE SORT\n" +
 "AND (SKIP MERGE)\n" +
 "CLIENT PARALLEL 1-WAY FULL SCAN OVER " + 
JOIN_ORDER_TABLE_DISPLAY_NAME + "\n" +
 "SERVER FILTER BY QUANTITY < 5000\n" +
@@ -129,6 +127,12 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.ItemTable\n" +
+"SERVER FILTER BY FIRST KEY ONLY"
 }});
 testCases.add(new String[][] {
 {
@@ -163,6 +167,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY FULL SCAN OVER Join.idx_item\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 testCases.add(new String[][] {
 {
@@ -197,6 +213,18 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {
 "SERVER SORTED BY [\"O.item_id\"]\n" +
 "CLIENT MERGE SORT\n" +
 "CLIENT 4 ROW LIMIT",
+
+"SORT-MERGE-JOIN (INNER) TABLES\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I1.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"AND\n" +
+"CLIENT PARALLEL 1-WAY RANGE SCAN OVER 
_LOCAL_IDX_Join.ItemTable [-32768]\n" +
+"SERVER FILTER BY FIRST KEY ONLY\n" +
+"SERVER SORTED BY [\"I2.:item_id\"]\n" +
+"CLIENT MERGE SORT\n" +
+"CLIENT SORTED BY [\"I1.:item_id\"]"
 }});
 return testCases;
 }
@@ -1674,6 +1702,9 @@ public class SortMergeJoinIT extends 
BaseHBaseManagedTimeIT {