PR comments

Author: thecoop

server/src/main/java/org/elasticsearch/index/codec/vectors/es93/ES93GenericFlatVectorsReader.java

@@ -11,7 +11,6 @@
 
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.codecs.hnsw.FlatVectorsReader;
-import org.apache.lucene.codecs.hnsw.FlatVectorsScorer;
 import org.apache.lucene.index.ByteVectorValues;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.FieldInfo;
@@ -39,7 +38,7 @@ class ES93GenericFlatVectorsReader extends FlatVectorsReader {
         SegmentReadState state,
         GenericFlatVectorReaders.LoadFlatVectorsReader loadReader
     ) throws IOException {
-        super(null);    // we can set this properly with flexible constructor bodies
+        super(null);    // this is not actually used by anything
 
         this.fieldInfos = state.fieldInfos;
         this.genericReaders = new GenericFlatVectorReaders();
@@ -96,12 +95,6 @@ record FieldEntry(String rawVectorFormatName, boolean useDirectIOReads) implemen
         }
     }
 
-    @Override
-    public FlatVectorsScorer getFlatVectorScorer() {
-        // just go with the first one
-        return genericReaders.allReaders().iterator().next().getFlatVectorScorer();
-    }
-
     @Override
     public FlatVectorsReader getMergeInstance() throws IOException {
         return new ES93GenericFlatVectorsReader(fieldInfos, genericReaders.getMergeInstance());

server/src/main/java/org/elasticsearch/index/codec/vectors/es93/ES93HnswBinaryQuantizedVectorsFormat.java

@@ -44,17 +44,6 @@ public ES93HnswBinaryQuantizedVectorsFormat() {
         flatVectorsFormat = new ES93BinaryQuantizedVectorsFormat();
     }
 
-    /**
-     * Constructs a format using the given graph construction parameters.
-     *
-     * @param maxConn the maximum number of connections to a node in the HNSW graph
-     * @param beamWidth the size of the queue maintained during graph construction.
-     */
-    public ES93HnswBinaryQuantizedVectorsFormat(int maxConn, int beamWidth) {
-        super(NAME, maxConn, beamWidth);
-        flatVectorsFormat = new ES93BinaryQuantizedVectorsFormat();
-    }
-
     /**
      * Constructs a format using the given graph construction parameters.
      *

server/src/test/java/org/elasticsearch/index/codec/vectors/es93/ES93HnswBinaryQuantizedVectorsFormatTests.java

@@ -52,6 +52,8 @@
 import java.util.Locale;
 
 import static java.lang.String.format;
+import static org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat.DEFAULT_BEAM_WIDTH;
+import static org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat.DEFAULT_MAX_CONN;
 import static org.apache.lucene.index.VectorSimilarityFunction.DOT_PRODUCT;
 import static org.apache.lucene.search.DocIdSetIterator.NO_MORE_DOCS;
 import static org.hamcrest.Matchers.either;
@@ -64,11 +66,17 @@ public class ES93HnswBinaryQuantizedVectorsFormatTests extends BaseKnnVectorsFor
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized
     }
 
-    static final Codec codec = TestUtil.alwaysKnnVectorsFormat(new ES93HnswBinaryQuantizedVectorsFormat());
+    private KnnVectorsFormat format;
+
+    @Override
+    public void setUp() throws Exception {
+        format = new ES93HnswBinaryQuantizedVectorsFormat(DEFAULT_MAX_CONN, DEFAULT_BEAM_WIDTH, random().nextBoolean());
+        super.setUp();
+    }
 
     @Override
     protected Codec getCodec() {
-        return codec;
+        return TestUtil.alwaysKnnVectorsFormat(format);
     }
 
     public void testToString() {
@@ -129,12 +137,12 @@ public void testSingleVectorCase() throws Exception {
     }
 
     public void testLimits() {
-        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(-1, 20));
-        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(0, 20));
-        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(20, 0));
-        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(20, -1));
-        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(512 + 1, 20));
-        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(20, 3201));
+        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(-1, 20, false));
+        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(0, 20, false));
+        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(20, 0, false));
+        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(20, -1, false));
+        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(512 + 1, 20, false));
+        expectThrows(IllegalArgumentException.class, () -> new ES93HnswBinaryQuantizedVectorsFormat(20, 3201, false));
         expectThrows(
             IllegalArgumentException.class,
             () -> new ES93HnswBinaryQuantizedVectorsFormat(20, 100, false, 1, new SameThreadExecutorService())