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/316871ba
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/316871ba
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/316871ba

Branch: refs/heads/4.x-HBase-1.0
Commit: 316871ba47a53696cdbfd4dbf6634e1eadaef013
Parents: a593e98
Author: maryannxue <[email protected]>
Authored: Tue Jan 5 09:36:36 2016 -0500
Committer: maryannxue <[email protected]>
Committed: Tue Jan 5 09:36:36 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/316871ba/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());

Reply via email to