Repository: phoenix Updated Branches: refs/heads/master 5327e1b27 -> 8d3c778a9
PHOENIX-2257 Failing integration test in DerivedTableIT (addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8d3c778a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8d3c778a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8d3c778a Branch: refs/heads/master Commit: 8d3c778a923672ae708b381ea817fa7bd44babb8 Parents: 5327e1b Author: maryannxue <[email protected]> Authored: Tue Jan 5 09:15:49 2016 -0500 Committer: maryannxue <[email protected]> Committed: Tue Jan 5 09:15:49 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/DerivedTableIT.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8d3c778a/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 95a7fed..82a742b 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 @@ -104,7 +104,8 @@ public class DerivedTableIT extends BaseClientManagedTimeIT { "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [A]\n" + "CLIENT AGGREGATE INTO DISTINCT ROWS BY [A]\n" + - "CLIENT DISTINCT ON [COLLECTDISTINCT(B)]"}}); + "CLIENT DISTINCT ON [COLLECTDISTINCT(B)]\n" + + "CLIENT SORTED BY [A DESC]"}}); testCases.add(new String[][] { {}, { "CLIENT PARALLEL 4-WAY FULL SCAN OVER ATABLE\n" + @@ -120,7 +121,8 @@ public class DerivedTableIT extends BaseClientManagedTimeIT { "CLIENT MERGE SORT\n" + "CLIENT SORTED BY [A]\n" + "CLIENT AGGREGATE INTO DISTINCT ROWS BY [A]\n" + - "CLIENT DISTINCT ON [COLLECTDISTINCT(B)]"}}); + "CLIENT DISTINCT ON [COLLECTDISTINCT(B)]\n" + + "CLIENT SORTED BY [A DESC]"}}); return testCases; } @@ -311,8 +313,8 @@ public class DerivedTableIT extends BaseClientManagedTimeIT { rs = conn.createStatement().executeQuery("EXPLAIN " + query); assertEquals(plans[0], QueryUtil.getExplainPlan(rs)); - // distinct b (groupby a, b) groupby a - query = "SELECT DISTINCT COLLECTDISTINCT(t.b) FROM (SELECT b_string b, a_string a FROM aTable GROUP BY a_string, b_string) AS t GROUP BY t.a"; + // distinct b (groupby a, b) groupby a orderby a + query = "SELECT DISTINCT COLLECTDISTINCT(t.b) FROM (SELECT b_string b, a_string a FROM aTable GROUP BY a_string, b_string) AS t GROUP BY t.a ORDER BY t.a DESC"; statement = conn.prepareStatement(query); rs = statement.executeQuery(); assertTrue (rs.next());
