Skip to content

Commit 6a0826e

Browse files
committed
Remove HnswBuilder interface
1 parent a954936 commit 6a0826e

File tree

3 files changed

+3
-62
lines changed

3 files changed

+3
-62
lines changed

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

Lines changed: 0 additions & 54 deletions
This file was deleted.

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* Builder for HNSW graph. See {@link HnswGraph} for a gloss on the algorithm and the meaning of the
5050
* hyper-parameters.
5151
*/
52-
public class HnswGraphBuilder implements HnswBuilder {
52+
public class HnswGraphBuilder {
5353

5454
/** Default number of maximum connections per node */
5555
public static final int DEFAULT_MAX_CONN = 16;
@@ -160,7 +160,6 @@ protected HnswGraphBuilder(
160160
beamCandidates0 = new GraphBuilderKnnCollector(Math.min(beamWidth / 2, M * 3));
161161
}
162162

163-
@Override
164163
public OnHeapHnswGraph build(int maxOrd) throws IOException {
165164
if (frozen) {
166165
throw new IllegalStateException("This HnswGraphBuilder is frozen and cannot be updated");
@@ -172,20 +171,17 @@ public OnHeapHnswGraph build(int maxOrd) throws IOException {
172171
return getCompletedGraph();
173172
}
174173

175-
@Override
176174
public void setInfoStream(InfoStream infoStream) {
177175
this.infoStream = infoStream;
178176
}
179177

180-
@Override
181178
public OnHeapHnswGraph getCompletedGraph() throws IOException {
182179
if (frozen == false) {
183180
finish();
184181
}
185182
return getGraph();
186183
}
187184

188-
@Override
189185
public OnHeapHnswGraph getGraph() {
190186
return hnsw;
191187
}
@@ -294,7 +290,6 @@ private void addGraphNodeInternal(int node, UpdateableRandomVectorScorer scorer,
294290
} while (true);
295291
}
296292

297-
@Override
298293
public void addGraphNode(int node) throws IOException {
299294
/*
300295
Note: this implementation is thread safe when graph size is fixed (e.g. when merging)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public IncrementalHnswGraphMerger addReader(KnnVectorsReader reader, MergeState.
110110
* @return HnswGraphBuilder
111111
* @throws IOException If an error occurs while reading from the merge state
112112
*/
113-
protected HnswBuilder createBuilder(KnnVectorValues mergedVectorValues, int maxOrd) throws IOException {
113+
protected HnswGraphBuilder createBuilder(KnnVectorValues mergedVectorValues, int maxOrd) throws IOException {
114114
if (graphReaders.size() == 0) {
115115
return HnswGraphBuilder.create(scorerSupplier, M, beamWidth, HnswGraphBuilder.randSeed, maxOrd);
116116
}
@@ -175,7 +175,7 @@ protected final int[][] getNewOrdMapping(KnnVectorValues mergedVectorValues, Bit
175175
}
176176

177177
public OnHeapHnswGraph merge(KnnVectorValues mergedVectorValues, InfoStream infoStream, int maxOrd) throws IOException {
178-
HnswBuilder builder = createBuilder(mergedVectorValues, maxOrd);
178+
HnswGraphBuilder builder = createBuilder(mergedVectorValues, maxOrd);
179179
builder.setInfoStream(infoStream);
180180
return builder.build(maxOrd);
181181
}

0 commit comments

Comments
 (0)