Remove previous implementation versions

Author: thecoop

server/src/main/java/module-info.java

@@ -7,7 +7,6 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import org.elasticsearch.index.codec.vectors.diskbbq.ES920DiskBBQVectorsFormat;
 import org.elasticsearch.plugins.internal.RestExtension;
 import org.elasticsearch.reservedstate.ReservedStateHandlerProvider;
 
@@ -462,9 +461,7 @@
             org.elasticsearch.index.codec.vectors.es816.ES816HnswBinaryQuantizedVectorsFormat,
             org.elasticsearch.index.codec.vectors.es818.ES818BinaryQuantizedVectorsFormat,
             org.elasticsearch.index.codec.vectors.es818.ES818HnswBinaryQuantizedVectorsFormat,
-            org.elasticsearch.index.codec.vectors.es818.DirectIOES818BinaryQuantizedVectorsFormat,
-            org.elasticsearch.index.codec.vectors.es818.DirectIOES818HnswBinaryQuantizedVectorsFormat,
-            ES920DiskBBQVectorsFormat;
+            org.elasticsearch.index.codec.vectors.diskbbq.ES920DiskBBQVectorsFormat;
 
     provides org.apache.lucene.codecs.Codec
         with

server/src/main/java/org/elasticsearch/index/codec/vectors/es818/DirectIOES818BinaryQuantizedVectorsFormat.java

@@ -31,10 +31,6 @@
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
-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.codecs.lucene99.Lucene99HnswVectorsFormat.DEFAULT_NUM_MERGE_WORKER;
-
 /**
  * Copied from Lucene, replace with Lucene's implementation sometime after Lucene 10
  */
@@ -43,11 +39,11 @@ public class ES818HnswBinaryQuantizedVectorsFormat extends AbstractHnswVectorsFo
     public static final String NAME = "ES818HnswBinaryQuantizedVectorsFormat";
 
     /** The format for storing, reading, merging vectors on disk */
-    private final FlatVectorsFormat flatVectorsFormat;
+    private static final FlatVectorsFormat flatVectorsFormat = new ES818BinaryQuantizedVectorsFormat();
 
     /** Constructs a format using default graph construction parameters */
     public ES818HnswBinaryQuantizedVectorsFormat() {
-        this(DEFAULT_MAX_CONN, DEFAULT_BEAM_WIDTH, DEFAULT_NUM_MERGE_WORKER, null);
+        super(NAME);
     }
 
     /**
@@ -57,7 +53,7 @@ public ES818HnswBinaryQuantizedVectorsFormat() {
      * @param beamWidth the size of the queue maintained during graph construction.
      */
     public ES818HnswBinaryQuantizedVectorsFormat(int maxConn, int beamWidth) {
-        this(maxConn, beamWidth, DEFAULT_NUM_MERGE_WORKER, null);
+        super(NAME, maxConn, beamWidth);
     }
 
     /**
@@ -71,19 +67,7 @@ public ES818HnswBinaryQuantizedVectorsFormat(int maxConn, int beamWidth) {
      *     generated by this format to do the merge
      */
     public ES818HnswBinaryQuantizedVectorsFormat(int maxConn, int beamWidth, int numMergeWorkers, ExecutorService mergeExec) {
-        this(NAME, maxConn, beamWidth, numMergeWorkers, new ES818BinaryQuantizedVectorsFormat(), mergeExec);
-    }
-
-    ES818HnswBinaryQuantizedVectorsFormat(
-        String name,
-        int maxConn,
-        int beamWidth,
-        int numMergeWorkers,
-        FlatVectorsFormat flatVectorsFormat,
-        ExecutorService mergeExec
-    ) {
-        super(name, maxConn, beamWidth, numMergeWorkers, mergeExec);
-        this.flatVectorsFormat = flatVectorsFormat;
+        super(NAME, maxConn, beamWidth, numMergeWorkers, mergeExec);
     }
 
     @Override

server/src/main/java/org/elasticsearch/index/codec/vectors/es818/DirectIOES818HnswBinaryQuantizedVectorsFormat.java

@@ -56,7 +56,6 @@
 import org.elasticsearch.index.codec.vectors.ES815BitFlatVectorFormat;
 import org.elasticsearch.index.codec.vectors.ES815HnswBitVectorsFormat;
 import org.elasticsearch.index.codec.vectors.diskbbq.ES920DiskBBQVectorsFormat;
-import org.elasticsearch.index.codec.vectors.es818.DirectIOES818HnswBinaryQuantizedVectorsFormat;
 import org.elasticsearch.index.codec.vectors.es818.ES818BinaryQuantizedVectorsFormat;
 import org.elasticsearch.index.codec.vectors.es818.ES818HnswBinaryQuantizedVectorsFormat;
 import org.elasticsearch.index.fielddata.FieldDataContext;
@@ -1449,7 +1448,7 @@ public boolean supportsDimension(int dims) {
             public DenseVectorIndexOptions parseIndexOptions(String fieldName, Map<String, ?> indexOptionsMap, IndexVersion indexVersion) {
                 Object mNode = indexOptionsMap.remove("m");
                 Object efConstructionNode = indexOptionsMap.remove("ef_construction");
-                Object disableOffheapCacheRescoringNode = indexOptionsMap.remove("disable_offheap_cache_rescoring");
+                Object directRawVectorReadsNode = indexOptionsMap.remove("direct_raw_vector_reads");
 
                 if (mNode == null) {
                     mNode = Lucene99HnswVectorsFormat.DEFAULT_MAX_CONN;
@@ -1468,10 +1467,10 @@ public DenseVectorIndexOptions parseIndexOptions(String fieldName, Map<String, ?
                     }
                 }
 
-                boolean disableOffheapCacheRescoring = XContentMapValues.nodeBooleanValue(disableOffheapCacheRescoringNode, false);
+                boolean directRawVectorReads = XContentMapValues.nodeBooleanValue(directRawVectorReadsNode, false);
 
                 MappingParser.checkNoRemainingFields(fieldName, indexOptionsMap);
-                return new BBQHnswIndexOptions(m, efConstruction, rescoreVector, disableOffheapCacheRescoring);
+                return new BBQHnswIndexOptions(m, efConstruction, rescoreVector, directRawVectorReads);
             }
 
             @Override
@@ -2019,21 +2018,19 @@ public String toString() {
     public static class BBQHnswIndexOptions extends QuantizedIndexOptions {
         private final int m;
         private final int efConstruction;
-        private final boolean disableOffheapCacheRescoring;
+        private final boolean directRawVectorReads;
 
-        public BBQHnswIndexOptions(int m, int efConstruction, RescoreVector rescoreVector, boolean disableOffheapCacheRescoring) {
+        public BBQHnswIndexOptions(int m, int efConstruction, RescoreVector rescoreVector, boolean directRawVectorReads) {
             super(VectorIndexType.BBQ_HNSW, rescoreVector);
             this.m = m;
             this.efConstruction = efConstruction;
-            this.disableOffheapCacheRescoring = disableOffheapCacheRescoring;
+            this.directRawVectorReads = directRawVectorReads;
         }
 
         @Override
         KnnVectorsFormat getVectorsFormat(ElementType elementType) {
             assert elementType == ElementType.FLOAT;
-            return disableOffheapCacheRescoring
-                ? new DirectIOES818HnswBinaryQuantizedVectorsFormat(m, efConstruction)
-                : new ES818HnswBinaryQuantizedVectorsFormat(m, efConstruction);
+            return new ES818HnswBinaryQuantizedVectorsFormat(m, efConstruction);
         }
 
         @Override
@@ -2048,12 +2045,12 @@ boolean doEquals(DenseVectorIndexOptions other) {
             return m == that.m
                 && efConstruction == that.efConstruction
                 && Objects.equals(rescoreVector, that.rescoreVector)
-                && disableOffheapCacheRescoring == that.disableOffheapCacheRescoring;
+                && directRawVectorReads == that.directRawVectorReads;
         }
 
         @Override
         int doHashCode() {
-            return Objects.hash(m, efConstruction, rescoreVector, disableOffheapCacheRescoring);
+            return Objects.hash(m, efConstruction, rescoreVector, directRawVectorReads);
         }
 
         @Override
@@ -2067,7 +2064,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field("type", type);
             builder.field("m", m);
             builder.field("ef_construction", efConstruction);
-            if (disableOffheapCacheRescoring) {
+            if (directRawVectorReads) {
                 builder.field("disable_offheap_cache_rescoring", true);
             }
             if (rescoreVector != null) {

server/src/main/java/org/elasticsearch/index/codec/vectors/es818/ES818HnswBinaryQuantizedVectorsFormat.java

@@ -7,6 +7,4 @@ org.elasticsearch.index.codec.vectors.es816.ES816BinaryQuantizedVectorsFormat
 org.elasticsearch.index.codec.vectors.es816.ES816HnswBinaryQuantizedVectorsFormat
 org.elasticsearch.index.codec.vectors.es818.ES818BinaryQuantizedVectorsFormat
 org.elasticsearch.index.codec.vectors.es818.ES818HnswBinaryQuantizedVectorsFormat
-org.elasticsearch.index.codec.vectors.es818.DirectIOES818BinaryQuantizedVectorsFormat
-org.elasticsearch.index.codec.vectors.es818.DirectIOES818HnswBinaryQuantizedVectorsFormat
 org.elasticsearch.index.codec.vectors.diskbbq.ES920DiskBBQVectorsFormat