Skip to content

Commit 98469e9

Browse files
committed
Fix tests
1 parent 5108d96 commit 98469e9

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,13 @@ RandomVectorScorerSupplier getRandomVectorScorerSupplier(
123123

124124
@Override
125125
public String toString() {
126-
return "ES910BinaryFlatVectorsScorer(nonQuantizedDelegate=" + nonQuantizedDelegate + ", queryBits = " + queryBits + ")";
126+
return "ES910BinaryFlatVectorsScorer(nonQuantizedDelegate="
127+
+ nonQuantizedDelegate
128+
+ ", indexBits="
129+
+ indexBits
130+
+ ", queryBits="
131+
+ queryBits
132+
+ ")";
127133
}
128134

129135
/** Vector scorer supplier over binarized vector values */

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.lucene.codecs.hnsw.FlatVectorsFormat;
2424
import org.apache.lucene.codecs.hnsw.FlatVectorsReader;
2525
import org.apache.lucene.codecs.hnsw.FlatVectorsWriter;
26+
import org.apache.lucene.codecs.lucene99.Lucene99FlatVectorsFormat;
2627
import org.apache.lucene.index.SegmentReadState;
2728
import org.apache.lucene.index.SegmentWriteState;
2829
import org.elasticsearch.index.codec.vectors.OptimizedScalarQuantizer;
@@ -98,7 +99,7 @@ public class ES910BinaryQuantizedVectorsFormat extends FlatVectorsFormat {
9899
static final String VECTOR_DATA_EXTENSION = "veb";
99100
static final int DIRECT_MONOTONIC_BLOCK_SHIFT = 16;
100101

101-
private static final DirectIOLucene99FlatVectorsFormat rawVectorFormat = new DirectIOLucene99FlatVectorsFormat(
102+
private static final FlatVectorsFormat rawVectorFormat = new Lucene99FlatVectorsFormat(
102103
FlatVectorScorerUtil.getLucene99FlatVectorsScorer()
103104
);
104105
private static byte DEFAULT_INDEX_BITS = (byte) 1;

server/src/test/java/org/elasticsearch/index/codec/vectors/es910/ES910BinaryQuantizedVectorsFormatTests.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,18 @@ public KnnVectorsFormat knnVectorsFormat() {
137137
};
138138
String expectedPattern = "ES910BinaryQuantizedVectorsFormat("
139139
+ "name=ES910BinaryQuantizedVectorsFormat, "
140-
+ "flatVectorScorer=ES910BinaryFlatVectorsScorer(nonQuantizedDelegate=%s()), indexBits=%d, queryBits=%d)";
141-
var defaultScorer = format(Locale.ROOT, expectedPattern, "DefaultFlatVectorScorer", indexBits, queryBits);
142-
var memSegScorer = format(Locale.ROOT, expectedPattern, "Lucene99MemorySegmentFlatVectorsScorer", indexBits, queryBits);
140+
+ "flatVectorScorer=ES910BinaryFlatVectorsScorer(nonQuantizedDelegate=%s(), indexBits=%d, queryBits=%d)"
141+
+ ", indexBits=%d, queryBits=%d)";
142+
var defaultScorer = format(Locale.ROOT, expectedPattern, "DefaultFlatVectorScorer", indexBits, queryBits, indexBits, queryBits);
143+
var memSegScorer = format(
144+
Locale.ROOT,
145+
expectedPattern,
146+
"Lucene99MemorySegmentFlatVectorsScorer",
147+
indexBits,
148+
queryBits,
149+
indexBits,
150+
queryBits
151+
);
143152
assertThat(customCodec.knnVectorsFormat().toString(), is(oneOf(defaultScorer, memSegScorer)));
144153
}
145154

0 commit comments

Comments
 (0)