CNDB-12308: Remove index-based sorting at CQL level

Do all coordinator-side sorting for index queries in StorageAttachedIndexQueryPlan#postProcessor.
datastax · Jan 9, 2025 · efcc375 · efcc375
1 parent db6f08f
commit efcc375
Show file tree

Hide file tree

Showing 19 changed files with 357 additions and 493 deletions.
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
@@ -133,15 +133,6 @@ public final boolean hasSupportingIndex(IndexRegistry indexRegistry)
         return false;
     }
 
-    @Override
-    public final Index findSupportingIndex(IndexRegistry indexRegistry)
-    {
-        for (Index index : indexRegistry.listIndexes())
-            if (isSupportingIndex(index))
-                return index;
-        return null;
-    }
-
     @Override
     public boolean needsFiltering(Index.Group indexGroup)
     {

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java b/src/java/org/apache/cassandra/cql3/restrictions/Restriction.java
@@ -73,14 +73,6 @@ public default boolean isOnToken()
      */
     public boolean hasSupportingIndex(IndexRegistry indexRegistry);
 
-    /**
-     * Find first supporting index for current restriction
-     *
-     * @param indexRegistry the index registry
-     * @return <code>index</code> if the restriction is on indexed columns, <code>null</code>
-     */
-    public Index findSupportingIndex(IndexRegistry indexRegistry);
-
     /**
      * Returns whether this restriction would need filtering if the specified index group were used.
      *

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
@@ -100,12 +100,6 @@ public boolean hasSupportingIndex(IndexRegistry indexRegistry)
             return false;
         }
 
-        @Override
-        public Index findSupportingIndex(IndexRegistry indexRegistry)
-        {
-            return null;
-        }
-
         @Override
         public boolean needsFiltering(Index.Group indexGroup)
         {
@@ -283,18 +277,6 @@ public boolean hasSupportingIndex(IndexRegistry indexRegistry)
             return false;
         }
 
-        @Override
-        public Index findSupportingIndex(IndexRegistry indexRegistry)
-        {
-            for (SingleRestriction restriction : restrictionsMap.values())
-            {
-                Index index = restriction.findSupportingIndex(indexRegistry);
-                if (index != null)
-                    return index;
-            }
-            return null;
-        }
-
         @Override
         public boolean needsFiltering(Index.Group indexGroup)
         {

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
@@ -84,12 +84,6 @@ public boolean hasSupportingIndex(IndexRegistry indexRegistry)
         return restrictions.hasSupportingIndex(indexRegistry);
     }
 
-    @Override
-    public Index findSupportingIndex(IndexRegistry indexRegistry)
-    {
-        return restrictions.findSupportingIndex(indexRegistry);
-    }
-
     @Override
     public boolean needsFiltering(Index.Group indexGroup)
     {

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java
@@ -83,16 +83,6 @@ public boolean hasSupportingIndex(IndexRegistry indexRegistry)
         return false;
     }
 
-    @Override
-    public Index findSupportingIndex(IndexRegistry indexRegistry)
-    {
-        for (Index index : indexRegistry.listIndexes())
-            if (isSupportedBy(index))
-                return index;
-
-        return null;
-    }
-
     @Override
     public boolean needsFiltering(Index.Group indexGroup)
     {

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java b/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
@@ -330,12 +330,6 @@ public boolean hasSupportingIndex(IndexRegistry indexRegistry)
         return restrictions.hasSupportingIndex(indexRegistry);
     }
 
-    @Override
-    public Index findSupportingIndex(IndexRegistry indexRegistry)
-    {
-        return restrictions.findSupportingIndex(indexRegistry);
-    }
-
     @Override
     public boolean needsFiltering(Index.Group indexGroup)
     {

diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
@@ -123,11 +123,6 @@ public boolean hasSupportingIndex(IndexRegistry indexRegistry)
         return false;
     }
 
-    @Override
-    public Index findSupportingIndex(IndexRegistry indexRegistry)
-    {
-        return null;
-    }
     @Override
     public boolean needsFiltering(Index.Group indexGroup)
     {