CC5 Fix for o.a.c.distributed.test.GenericOrderByTest.testOrderBy

Reverts previous "CC5 fix AbstractReadQueryToCQLTest" that changed SelectStatement.getQuery with a union of CC and CASSANDRA-19968 logic about when to use range or slice commands;
The incorrect ordering results are possibly due to a conflict with the C* 19968 logic and "CNDB-12308: Remove index-based sorting at CQL level" ;
Restoring the CC logic maintains CC expectation about ordering of results;
AbstractReadQueryToCQLTest is changed to expect CQL representations based on use of range commands instead of slice commands.

Author: djatnieks

src/java/org/apache/cassandra/cql3/statements/SelectStatement.java

@@ -494,25 +494,19 @@ public ReadQuery getQuery(QueryOptions options,
                               int userOffset,
                               AggregationSpecification aggregationSpec)
     {
+        boolean isPartitionRangeQuery = restrictions.isKeyRange() || restrictions.usesSecondaryIndexing() || restrictions.isDisjunction();
+
         RowFilter rowFilter = getRowFilter(options, state);
         DataLimits limit = getDataLimits(state, userLimit, perPartitionLimit, userOffset, aggregationSpec);
 
         ReadQuery query;
-        if (restrictions.isKeyRange())
+        if (isPartitionRangeQuery)
         {
-            if (restrictions.usesSecondaryIndexing() && !SchemaConstants.isLocalSystemKeyspace(table.keyspace))
+            if (restrictions.isKeyRange() && restrictions.usesSecondaryIndexing() && !SchemaConstants.isLocalSystemKeyspace(table.keyspace))
                 Guardrails.nonPartitionRestrictedIndexQueryEnabled.ensureEnabled(state);
 
             query = getRangeCommand(options, state, columnFilter, rowFilter, limit, nowInSec);
         }
-        else if (restrictions.usesSecondaryIndexing() && !rowFilter.isStrict())
-        {
-            query = getRangeCommand(options, state, columnFilter, rowFilter, limit, nowInSec);
-        }
-        else if (restrictions.isDisjunction())
-        {
-            query = getRangeCommand(options, state, columnFilter, rowFilter, limit, nowInSec);
-        }
         else
         {
             query = getSliceCommands(options, state, columnFilter, rowFilter, limit, nowInSec);

test/unit/org/apache/cassandra/db/AbstractReadQueryToCQLStringTest.java

@@ -110,7 +110,8 @@ public void testSkinnyTable() throws Throwable
              "SELECT * FROM %s WHERE v1 = 1 AND v2 = 2 ALLOW FILTERING",
              "SELECT * FROM %s WHERE v2 = 2 AND v1 = 1 ALLOW FILTERING");
         test("SELECT * FROM %s WHERE token(k) > 0 AND v1 = 1");
-        test("SELECT * FROM %s WHERE k = 0 AND v1 = 1");
+        test("SELECT * FROM %s WHERE k = 0 AND v1 = 1",
+             "SELECT * FROM %s WHERE token(k) >= token(0) AND token(k) <= token(0) AND v1 = 1 ALLOW FILTERING");
 
         // grouped partition-directed queries, maybe producing multiple queries
         test("SELECT * FROM %s WHERE k IN (0)",
@@ -202,7 +203,9 @@ public void testSkinnyTableWithMulticolumnKey() throws Throwable
         test("SELECT * FROM %s WHERE token(k1, k2) > 0 AND k2 = 2");
         test("SELECT * FROM %s WHERE token(k1, k2) > 0 AND v1 = 1");
         test("SELECT * FROM %s WHERE token(k1, k2) > 0 AND v2 = 2");
-        test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND v1 = 1");
+//      test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND v1 = 1");
+        test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND v1 = 1",
+                          "SELECT * FROM %s WHERE token(k1, k2) >= token(1, 2) AND token(k1, k2) <= token(1, 2) AND v1 = 1 ALLOW FILTERING");
 
         // grouped partition-directed queries, maybe producing multiple queries
         test("SELECT * FROM %s WHERE k1 IN (1) AND k2 = 2",
@@ -304,9 +307,10 @@ public void testWideTable() throws Throwable
              "SELECT * FROM %s WHERE v1 = 1 AND v2 = 2 ALLOW FILTERING",
              "SELECT * FROM %s WHERE v2 = 2 AND v1 = 1 ALLOW FILTERING");
         test("SELECT * FROM %s WHERE token(k) > 0 AND v1 = 1");
-        test("SELECT * FROM %s WHERE k = 0 AND v1 = 1");
+        test("SELECT * FROM %s WHERE k = 0 AND v1 = 1",
+             "SELECT * FROM %s WHERE token(k) >= token(0) AND token(k) <= token(0) AND v1 = 1 ALLOW FILTERING");
         test("SELECT * FROM %s WHERE k = 0 AND v1 = 1 AND c = 1",
-             "SELECT * FROM %s WHERE k = 0 AND c = 1 AND v1 = 1 ALLOW FILTERING");
+             "SELECT * FROM %s WHERE token(k) >= token(0) AND token(k) <= token(0) AND c = 1 AND v1 = 1 ALLOW FILTERING");
 
         // grouped partition-directed queries, maybe producing multiple queries
         test("SELECT * FROM %s WHERE k IN (0)",
@@ -462,8 +466,10 @@ public void testWideTableWithMulticolumnKey() throws Throwable
              "SELECT * FROM %s WHERE v1 = 1 AND v2 = 2 ALLOW FILTERING",
              "SELECT * FROM %s WHERE v2 = 2 AND v1 = 1 ALLOW FILTERING");
         test("SELECT * FROM %s WHERE token(k1, k2) > 0 AND v1 = 1");
-        test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND v1 = 1");
-        test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND c1 = 1 AND v1 = 1");
+        test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND v1 = 1",
+             "SELECT * FROM %s WHERE token(k1, k2) >= token(1, 2) AND token(k1, k2) <= token(1, 2) AND v1 = 1 ALLOW FILTERING");
+        test("SELECT * FROM %s WHERE k1 = 1 AND k2 = 2 AND c1 = 1 AND v1 = 1",
+             "SELECT * FROM %s WHERE token(k1, k2) >= token(1, 2) AND token(k1, k2) <= token(1, 2) AND c1 = 1 AND v1 = 1 ALLOW FILTERING");
 
         // grouped partition-directed queries, maybe producing multiple queries
         test("SELECT * FROM %s WHERE k1 IN (1) AND k2 IN (2)",