Merge branch 'cndb-15554' into revive-fused-adc

Author: michaeljmarshall

build.xml

@@ -741,7 +741,7 @@
           <dependency groupId="org.apache.lucene" artifactId="lucene-core" version="9.8.0" />
           <dependency groupId="org.apache.lucene" artifactId="lucene-analysis-common" version="9.8.0" />
           <dependency groupId="org.apache.lucene" artifactId="lucene-backward-codecs" version="9.8.0" />
-          <dependency groupId="io.github.jbellis" artifactId="jvector" version="4.0.0-rc.3-SNAPSHOT" />
+          <dependency groupId="io.github.jbellis" artifactId="jvector" version="4.0.0-rc.4-SNAPSHOT" />
           <dependency groupId="com.bpodgursky" artifactId="jbool_expressions" version="1.14" scope="test"/>
 
           <dependency groupId="com.carrotsearch.randomizedtesting" artifactId="randomizedtesting-runner" version="2.1.2" scope="test">

src/java/org/apache/cassandra/index/sai/disk/vector/CassandraDiskAnn.java

@@ -27,7 +27,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.github.jbellis.jvector.graph.GraphIndex;
+import io.github.jbellis.jvector.graph.ImmutableGraphIndex;
 import io.github.jbellis.jvector.graph.GraphSearcher;
 import io.github.jbellis.jvector.graph.disk.feature.FeatureId;
 import io.github.jbellis.jvector.graph.disk.OnDiskGraphIndex;
@@ -72,7 +72,7 @@ public class CassandraDiskAnn
     private final FileHandle graphHandle;
     private final OnDiskOrdinalsMap ordinalsMap;
     private final Set<FeatureId> features;
-    private final GraphIndex graph;
+    private final ImmutableGraphIndex graph;
     private final VectorSimilarityFunction similarityFunction;
     @Nullable
     private final CompressedVectors compressedVectors;
@@ -231,7 +231,7 @@ public CloseableIterator<RowIdWithScore> search(VectorFloat<?> queryVector,
         searcher.usePruning(usePruning);
         try
         {
-            var view = (GraphIndex.ScoringView) searcher.getView();
+            var view = (ImmutableGraphIndex.ScoringView) searcher.getView();
             SearchScoreProvider ssp;
             if (features.contains(FeatureId.FUSED_PQ))
             {
@@ -309,9 +309,9 @@ public OrdinalsView getOrdinalsView()
         return ordinalsMap.getOrdinalsView();
     }
 
-    public GraphIndex.ScoringView getView()
+    public ImmutableGraphIndex.ScoringView getView()
     {
-        return (GraphIndex.ScoringView) graph.getView();
+        return (ImmutableGraphIndex.ScoringView) graph.getView();
     }
 
     public boolean containsUnitVectors()

src/java/org/apache/cassandra/index/sai/disk/vector/CloseableReranker.java

@@ -20,21 +20,21 @@
 
 import java.io.Closeable;
 
-import io.github.jbellis.jvector.graph.GraphIndex;
+import io.github.jbellis.jvector.graph.ImmutableGraphIndex;
 import io.github.jbellis.jvector.graph.similarity.ScoreFunction;
 import io.github.jbellis.jvector.vector.VectorSimilarityFunction;
 import io.github.jbellis.jvector.vector.types.VectorFloat;
 import org.apache.cassandra.io.util.FileUtils;
 
 /**
- * An ExactScoreFunction that closes the underlying {@link GraphIndex.ScoringView} when closed.
+ * An ExactScoreFunction that closes the underlying {@link ImmutableGraphIndex.ScoringView} when closed.
  */
 public class CloseableReranker implements ScoreFunction.ExactScoreFunction, Closeable
 {
-    private final GraphIndex.ScoringView view;
+    private final ImmutableGraphIndex.ScoringView view;
     private final ExactScoreFunction scoreFunction;
 
-    public CloseableReranker(VectorSimilarityFunction similarityFunction, VectorFloat<?> queryVector, GraphIndex.ScoringView view)
+    public CloseableReranker(VectorSimilarityFunction similarityFunction, VectorFloat<?> queryVector, ImmutableGraphIndex.ScoringView view)
     {
         this.view = view;
         this.scoreFunction = view.rerankerFor(queryVector, similarityFunction);

test/unit/org/apache/cassandra/index/sai/disk/vector/BruteForceRowIdIteratorTest.java

@@ -23,7 +23,7 @@
 
 import org.junit.Test;
 
-import io.github.jbellis.jvector.graph.GraphIndex;
+import io.github.jbellis.jvector.graph.ImmutableGraphIndex;
 import io.github.jbellis.jvector.graph.NodeQueue;
 import io.github.jbellis.jvector.graph.NodesIterator;
 import io.github.jbellis.jvector.graph.similarity.ScoreFunction;
@@ -64,7 +64,7 @@ public void testBruteForceRowIdIteratorForEmptyPQAndTopKEqualsLimit()
         assertTrue(view.isClosed);
     }
 
-    private static class TestView implements GraphIndex.ScoringView
+    private static class TestView implements ImmutableGraphIndex.ScoringView
     {
         private boolean isClosed = false;
 
@@ -97,7 +97,7 @@ public NodesIterator getNeighborsIterator(int i, int i1)
         }
 
         @Override
-        public void processNeighbors(int i, int i1, ScoreFunction scoreFunction, Function<Integer, Boolean> function, GraphIndex.NeighborProcessor neighborProcessor)
+        public void processNeighbors(int i, int i1, ScoreFunction scoreFunction, Function<Integer, Boolean> function, ImmutableGraphIndex.NeighborProcessor neighborProcessor)
         {
 
         }
@@ -109,7 +109,7 @@ public int size()
         }
 
         @Override
-        public GraphIndex.NodeAtLevel entryNode()
+        public ImmutableGraphIndex.NodeAtLevel entryNode()
         {
             throw new UnsupportedOperationException();
         }
@@ -119,5 +119,11 @@ public Bits liveNodes()
         {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public boolean contains(int i, int i1)
+        {
+            return false;
+        }
     }
 }