Remove HnswGraphMerger, clean classes

Author: carlosdelest

server/src/main/java/org/elasticsearch/index/codec/vectors/es910/ES910HnswVectorsWriter.java

@@ -47,7 +47,6 @@
 import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
 import org.apache.lucene.util.packed.DirectMonotonicWriter;
 import org.elasticsearch.index.codec.vectors.es910.hnsw.HnswGraphBuilder;
-import org.elasticsearch.index.codec.vectors.es910.hnsw.HnswGraphMerger;
 import org.elasticsearch.index.codec.vectors.es910.hnsw.IncrementalHnswGraphMerger;
 import org.elasticsearch.index.codec.vectors.es910.hnsw.NeighborArray;
 import org.elasticsearch.index.codec.vectors.es910.hnsw.OnHeapHnswGraph;
@@ -354,7 +353,7 @@ public void mergeOneField(FieldInfo fieldInfo, MergeState mergeState) throws IOE
             int[][] vectorIndexNodeOffsets = null;
             if (scorerSupplier.totalVectorCount() > 0) {
                 // build graph
-                HnswGraphMerger merger = createGraphMerger(fieldInfo, scorerSupplier);
+                IncrementalHnswGraphMerger merger = createGraphMerger(fieldInfo, scorerSupplier);
                 for (int i = 0; i < mergeState.liveDocs.length; i++) {
                     if (hasVectorValues(mergeState.fieldInfos[i], fieldInfo.name)) {
                         merger.addReader(mergeState.knnVectorsReaders[i], mergeState.docMaps[i], mergeState.liveDocs[i]);
@@ -490,7 +489,7 @@ private void writeMeta(
         }
     }
 
-    private HnswGraphMerger createGraphMerger(FieldInfo fieldInfo, RandomVectorScorerSupplier scorerSupplier) {
+    private IncrementalHnswGraphMerger createGraphMerger(FieldInfo fieldInfo, RandomVectorScorerSupplier scorerSupplier) {
         return new IncrementalHnswGraphMerger(fieldInfo, scorerSupplier, M, beamWidth);
     }
 

server/src/main/java/org/elasticsearch/index/codec/vectors/es910/hnsw/HnswGraphMerger.java

@@ -44,7 +44,7 @@
 /**
  * This merges multiple graphs in a single thread in incremental fashion.
  */
-public class IncrementalHnswGraphMerger implements HnswGraphMerger {
+public class IncrementalHnswGraphMerger {
 
     protected final FieldInfo fieldInfo;
     protected final RandomVectorScorerSupplier scorerSupplier;
@@ -71,7 +71,6 @@ public IncrementalHnswGraphMerger(FieldInfo fieldInfo, RandomVectorScorerSupplie
      * Adds a reader to the graph merger if it meets the following criteria: 1. does not contain any
      * deleted docs 2. is a HnswGraphProvider
      */
-    @Override
     public IncrementalHnswGraphMerger addReader(KnnVectorsReader reader, MergeState.DocMap docMap, Bits liveDocs) throws IOException {
         numReaders++;
         if (hasDeletes(liveDocs) || (reader instanceof HnswGraphProvider == false)) {
@@ -175,7 +174,6 @@ protected final int[][] getNewOrdMapping(KnnVectorValues mergedVectorValues, Bit
         return oldToNewOrdinalMap;
     }
 
-    @Override
     public OnHeapHnswGraph merge(KnnVectorValues mergedVectorValues, InfoStream infoStream, int maxOrd) throws IOException {
         HnswBuilder builder = createBuilder(mergedVectorValues, maxOrd);
         builder.setInfoStream(infoStream);

server/src/main/java/org/elasticsearch/index/codec/vectors/es910/hnsw/IncrementalHnswGraphMerger.java

@@ -20,10 +20,7 @@
 
 package org.elasticsearch.index.codec.vectors.es910.hnsw;
 
-import org.apache.lucene.util.BitSet;
 import org.apache.lucene.util.hnsw.HnswGraph;
-import org.apache.lucene.util.hnsw.RandomVectorScorerSupplier;
-import org.apache.lucene.util.hnsw.UpdateableRandomVectorScorer;
 
 import java.io.IOException;
 
@@ -33,39 +30,7 @@
  * This creates a graph builder that is initialized with the provided HnswGraph. This is useful for
  * merging HnswGraphs from multiple segments.
  */
-public final class InitializedHnswGraphBuilder extends HnswGraphBuilder {
-
-    /**
-     * Create a new HnswGraphBuilder that is initialized with the provided HnswGraph.
-     *
-     * @param scorerSupplier the scorer to use for vectors
-     * @param beamWidth the number of nodes to explore in the search
-     * @param seed the seed for the random number generator
-     * @param initializerGraph the graph to initialize the new graph builder
-     * @param newOrdMap a mapping from the old node ordinal to the new node ordinal
-     * @param initializedNodes a bitset of nodes that are already initialized in the initializerGraph
-     * @param totalNumberOfVectors the total number of vectors in the new graph, this should include
-     *     all vectors expected to be added to the graph in the future
-     * @return a new HnswGraphBuilder that is initialized with the provided HnswGraph
-     * @throws IOException when reading the graph fails
-     */
-    public static InitializedHnswGraphBuilder fromGraph(
-        RandomVectorScorerSupplier scorerSupplier,
-        int beamWidth,
-        long seed,
-        HnswGraph initializerGraph,
-        int[] newOrdMap,
-        BitSet initializedNodes,
-        int totalNumberOfVectors
-    ) throws IOException {
-        return new InitializedHnswGraphBuilder(
-            scorerSupplier,
-            beamWidth,
-            seed,
-            initGraph(initializerGraph, newOrdMap, totalNumberOfVectors),
-            initializedNodes
-        );
-    }
+public final class InitializedHnswGraphBuilder {
 
     public static OnHeapHnswGraph initGraph(HnswGraph initializerGraph, int[] newOrdMap, int totalNumberOfVectors) throws IOException {
         OnHeapHnswGraph hnsw = new OnHeapHnswGraph(initializerGraph.maxConn(), totalNumberOfVectors);
@@ -88,33 +53,4 @@ public static OnHeapHnswGraph initGraph(HnswGraph initializerGraph, int[] newOrd
         }
         return hnsw;
     }
-
-    private final BitSet initializedNodes;
-
-    public InitializedHnswGraphBuilder(
-        RandomVectorScorerSupplier scorerSupplier,
-        int beamWidth,
-        long seed,
-        OnHeapHnswGraph initializedGraph,
-        BitSet initializedNodes
-    ) throws IOException {
-        super(scorerSupplier, beamWidth, seed, initializedGraph);
-        this.initializedNodes = initializedNodes;
-    }
-
-    @Override
-    public void addGraphNode(int node, UpdateableRandomVectorScorer scorer) throws IOException {
-        if (initializedNodes.get(node)) {
-            return;
-        }
-        super.addGraphNode(node, scorer);
-    }
-
-    @Override
-    public void addGraphNode(int node) throws IOException {
-        if (initializedNodes.get(node)) {
-            return;
-        }
-        super.addGraphNode(node);
-    }
 }