MM fix to merge restoring SAI special case to isReversed

datastax · Feb 21, 2025 · a3d5c67 · a3d5c67
1 parent 9ef4397
commit a3d5c67
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1539,6 +1539,10 @@ private ColumnComparator<List<ByteBuffer>> getOrderingComparator(Selection selec
 
         private boolean isReversed(TableMetadata table, Map<ColumnMetadata, Ordering> orderingColumns) throws InvalidRequestException
         {
+            // Nonclustered ordering handles descending logic through ScoreOrderedResultRetriever and TKP
+            if (orderingColumns.values().stream().anyMatch(o -> o.expression.hasNonClusteredOrdering()))
+                return false;
+
             Boolean[] clusteredMap = new Boolean[table.clusteringColumns().size()];
             for (var entry : orderingColumns.entrySet())
             {