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/10/23 19:32:21 UTC
phoenix git commit: PHOENIX-2257 Failing integration test in
DerivedTableIT
Repository: phoenix
Updated Branches:
refs/heads/master 3cbebb8bd -> f3c460662
PHOENIX-2257 Failing integration test in DerivedTableIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f3c46066
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f3c46066
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f3c46066
Branch: refs/heads/master
Commit: f3c4606626f1d3e9bf2b567a880e198143c1e3c8
Parents: 3cbebb8
Author: maryannxue <we...@intel.com>
Authored: Fri Oct 23 13:31:45 2015 -0400
Committer: maryannxue <we...@intel.com>
Committed: Fri Oct 23 13:31:45 2015 -0400
----------------------------------------------------------------------
.../src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java | 2 ++
.../src/main/java/org/apache/phoenix/compile/QueryCompiler.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f3c46066/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
index b7c4906..7b21f37 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
@@ -102,6 +102,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
"CLIENT PARALLEL 1-WAY FULL SCAN OVER ATABLE_DERIVED_IDX\n" +
" SERVER AGGREGATE INTO DISTINCT ROWS BY [\"A_STRING\", \"B_STRING\"]\n" +
"CLIENT MERGE SORT\n" +
+ "CLIENT SORTED BY [A]\n" +
"CLIENT AGGREGATE INTO DISTINCT ROWS BY [A]\n" +
"CLIENT DISTINCT ON [COLLECTDISTINCT(B)]"}});
testCases.add(new String[][] {
@@ -117,6 +118,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
"CLIENT PARALLEL 4-WAY FULL SCAN OVER ATABLE\n" +
" SERVER AGGREGATE INTO DISTINCT ROWS BY [A_STRING, B_STRING]\n" +
"CLIENT MERGE SORT\n" +
+ "CLIENT SORTED BY [A]\n" +
"CLIENT AGGREGATE INTO DISTINCT ROWS BY [A]\n" +
"CLIENT DISTINCT ON [COLLECTDISTINCT(B)]"}});
return testCases;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f3c46066/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
index 4333539..8a9abc2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryCompiler.java
@@ -500,8 +500,9 @@ public class QueryCompiler {
context.setResolver(resolver);
tableRef = resolver.getTables().get(0);
context.setCurrentTable(tableRef);
+ boolean isInRowKeyOrder = innerPlan.getGroupBy() == GroupBy.EMPTY_GROUP_BY && innerPlan.getOrderBy() == OrderBy.EMPTY_ORDER_BY;
- return compileSingleFlatQuery(context, select, binds, asSubquery, allowPageFilter, innerPlan, tupleProjector, innerPlan.getOrderBy().getOrderByExpressions().isEmpty());
+ return compileSingleFlatQuery(context, select, binds, asSubquery, allowPageFilter, innerPlan, tupleProjector, isInRowKeyOrder);
}
protected QueryPlan compileSingleFlatQuery(StatementContext context, SelectStatement select, List<Object> binds, boolean asSubquery, boolean allowPageFilter, QueryPlan innerPlan, TupleProjector innerPlanTupleProjector, boolean isInRowKeyOrder) throws SQLException{