Forbid ANN options in SAI (for now)

datastax · Jan 24, 2025 · fbc3e21 · fbc3e21
1 parent d915bae
commit fbc3e21
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java b/src/java/org/apache/cassandra/index/sai/StorageAttachedIndex.java
@@ -78,6 +78,7 @@
 import org.apache.cassandra.dht.OrderPreservingPartitioner;
 import org.apache.cassandra.dht.RandomPartitioner;
 import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.index.ANNOptions;
 import org.apache.cassandra.index.Index;
 import org.apache.cassandra.index.IndexBuildDecider;
 import org.apache.cassandra.index.IndexRegistry;
@@ -700,6 +701,10 @@ public void validate(ReadCommand command) throws InvalidRequestException
             throw new InvalidRequestException(String.format("SAI based ORDER BY clause requires a LIMIT that is not greater than %s. LIMIT was %s",
                                                             MAX_TOP_K, command.limits().isUnlimited() ? "NO LIMIT" : command.limits().count()));
 
+        ANNOptions annOptions = command.rowFilter().annOptions;
+        if (annOptions != ANNOptions.NONE)
+            throw new InvalidRequestException("SAI doesn't support ANN options yet.");
+
         indexContext.validate(command.rowFilter());
     }
 

diff --git a/test/unit/org/apache/cassandra/index/sai/cql/NativeIndexDDLTest.java b/test/unit/org/apache/cassandra/index/sai/cql/NativeIndexDDLTest.java
@@ -79,6 +79,7 @@
 import org.apache.cassandra.schema.TableMetadata;
 import org.apache.cassandra.utils.FBUtilities;
 import org.apache.cassandra.utils.Throwables;
+import org.assertj.core.api.Assertions;
 import org.mockito.Mockito;
 
 import static java.util.Collections.singletonList;
@@ -1619,4 +1620,18 @@ public void shouldRejectLargeVector()
 //                              "exceeding the max vector term size of 16.000KiB. " +
 //                              "That sets an implicit limit of 4096 dimensions for float vectors.");
     }
+
+    @Test
+    public void shouldRejectANNOptions()
+    {
+        createTable("CREATE TABLE %s (k int PRIMARY KEY, v vector<float, 1>)");
+        createIndex("CREATE CUSTOM INDEX ON %s(v) USING 'StorageAttachedIndex' " +
+                    "WITH OPTIONS = {'similarity_function' : 'euclidean'}");
+        Assertions.assertThatThrownBy(() -> execute("SELECT * FROM %s " +
+                                                    "ORDER BY v ANN OF [1.0] " +
+                                                    "LIMIT 10 " +
+                                                    "WITH ann_options = {'rerank_k': 10}"))
+                  .isInstanceOf(InvalidRequestException.class)
+                  .hasMessageContaining("SAI doesn't support ANN options yet.");
+    }
 }