Skip to content

Commit 97d993c

Browse files
committed
Merge remote-tracking branch 'carlosdelest/feature/dense-vector-hnsw-reduce-heap' into feature/dense-vector-hnsw-reduce-heap
2 parents 49b666f + 86ff8f1 commit 97d993c

File tree

4 files changed

+3
-20
lines changed

4 files changed

+3
-20
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
import org.elasticsearch.index.codec.Elasticsearch910Lucene102Codec;
1110
import org.elasticsearch.index.codec.vectors.es910.ES910HnswVectorsFormat;
1211
import org.elasticsearch.plugins.internal.RestExtension;
1312
import org.elasticsearch.reservedstate.ReservedStateHandlerProvider;

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,7 @@ public ES818HnswBinaryQuantizedVectorsFormat(int maxConn, int beamWidth, int num
119119

120120
@Override
121121
public KnnVectorsWriter fieldsWriter(SegmentWriteState state) throws IOException {
122-
return new ES910HnswVectorsWriter(
123-
state,
124-
maxConn,
125-
beamWidth,
126-
flatVectorsFormat.fieldsWriter(state),
127-
numMergeWorkers,
128-
mergeExec
129-
);
122+
return new ES910HnswVectorsWriter(state, maxConn, beamWidth, flatVectorsFormat.fieldsWriter(state), numMergeWorkers, mergeExec);
130123
}
131124

132125
@Override

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,7 @@ public ES910HnswVectorsFormat(int maxConn, int beamWidth, int numMergeWorkers, E
131131

132132
@Override
133133
public KnnVectorsWriter fieldsWriter(SegmentWriteState state) throws IOException {
134-
return new ES910HnswVectorsWriter(
135-
state,
136-
maxConn,
137-
beamWidth,
138-
flatVectorsFormat.fieldsWriter(state),
139-
numMergeWorkers,
140-
mergeExec
141-
);
134+
return new ES910HnswVectorsWriter(state, maxConn, beamWidth, flatVectorsFormat.fieldsWriter(state), numMergeWorkers, mergeExec);
142135
}
143136

144137
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,7 @@ static int distFuncToOrd(VectorSimilarityFunction func) {
539539

540540
private static class FieldWriter<T> extends KnnFieldVectorsWriter<T> {
541541

542-
private static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(
543-
ES910HnswVectorsWriter.FieldWriter.class
544-
);
542+
private static final long SHALLOW_SIZE = RamUsageEstimator.shallowSizeOfInstance(ES910HnswVectorsWriter.FieldWriter.class);
545543

546544
private final FieldInfo fieldInfo;
547545
private final HnswGraphBuilder hnswGraphBuilder;

0 commit comments

Comments
 (0)