Skip to content

Commit 6ce7f50

Browse files
author
Kaival Parikh
committed
Fix test failures
1 parent c603591 commit 6ce7f50

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

lucene/core/src/java24/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentScalarQuantizedVectorScorer.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
*/
1717
package org.apache.lucene.internal.vectorization;
1818

19-
import static java.lang.foreign.ValueLayout.JAVA_FLOAT;
19+
import static java.lang.foreign.ValueLayout.JAVA_INT_UNALIGNED;
2020
import static org.apache.lucene.codecs.hnsw.ScalarQuantizedVectorScorer.quantizeQuery;
2121

2222
import java.io.IOException;
2323
import java.lang.foreign.MemorySegment;
24+
import java.lang.foreign.ValueLayout;
25+
import java.nio.ByteOrder;
2426
import org.apache.lucene.codecs.hnsw.DefaultFlatVectorScorer;
2527
import org.apache.lucene.codecs.hnsw.FlatVectorsScorer;
2628
import org.apache.lucene.codecs.lucene99.Lucene99ScalarQuantizedVectorScorer;
@@ -145,6 +147,9 @@ ScalarQuantizer getQuantizer() {
145147
return quantizer;
146148
}
147149

150+
private static final ValueLayout.OfInt INT_UNALIGNED_LE =
151+
JAVA_INT_UNALIGNED.withOrder(ByteOrder.LITTLE_ENDIAN);
152+
148153
@SuppressWarnings("restricted")
149154
Node getNode(int ord) throws IOException {
150155
checkOrdinal(ord);
@@ -157,7 +162,9 @@ Node getNode(int ord) throws IOException {
157162
input.readBytes(byteOffset, scratch, 0, nodeSize);
158163
node = MemorySegment.ofArray(scratch);
159164
}
160-
return new Node(node.reinterpret(vectorByteSize), node.get(JAVA_FLOAT, vectorByteSize));
165+
return new Node(
166+
node.reinterpret(vectorByteSize),
167+
Float.intBitsToFloat(node.get(INT_UNALIGNED_LE, vectorByteSize)));
161168
}
162169

163170
float scoreBody(int ord, float queryOffset) throws IOException {

lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99HnswQuantizedVectorsFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public KnnVectorsFormat knnVectorsFormat() {
306306
"Lucene99HnswScalarQuantizedVectorsFormat(name=Lucene99HnswScalarQuantizedVectorsFormat, maxConn=10, beamWidth=20, flatVectorFormat=Lucene99ScalarQuantizedVectorsFormat(name=Lucene99ScalarQuantizedVectorsFormat, confidenceInterval=0.9, bits=4, compress=false, flatVectorScorer=ScalarQuantizedVectorScorer(nonQuantizedDelegate=DefaultFlatVectorScorer()), rawVectorFormat=Lucene99FlatVectorsFormat(vectorsScorer=%s())))";
307307
var defaultScorer = format(Locale.ROOT, expectedPattern, "DefaultFlatVectorScorer");
308308
var memSegScorer =
309-
format(Locale.ROOT, expectedPattern, "Lucene99MemorySegmentFlatVectorsScorer");
309+
format(Locale.ROOT, expectedPattern, "Lucene99MemorySegmentScalarQuantizedVectorScorer");
310310
assertThat(customCodec.knnVectorsFormat().toString(), is(oneOf(defaultScorer, memSegScorer)));
311311
}
312312

lucene/core/src/test/org/apache/lucene/codecs/lucene99/TestLucene99ScalarQuantizedVectorsFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public KnnVectorsFormat knnVectorsFormat() {
375375
"Lucene99ScalarQuantizedVectorsFormat(name=Lucene99ScalarQuantizedVectorsFormat, confidenceInterval=0.9, bits=4, compress=false, flatVectorScorer=ScalarQuantizedVectorScorer(nonQuantizedDelegate=DefaultFlatVectorScorer()), rawVectorFormat=Lucene99FlatVectorsFormat(vectorsScorer=%s()))";
376376
var defaultScorer = format(Locale.ROOT, expectedPattern, "DefaultFlatVectorScorer");
377377
var memSegScorer =
378-
format(Locale.ROOT, expectedPattern, "Lucene99MemorySegmentFlatVectorsScorer");
378+
format(Locale.ROOT, expectedPattern, "Lucene99MemorySegmentScalarQuantizedVectorScorer");
379379
assertThat(customCodec.knnVectorsFormat().toString(), is(oneOf(defaultScorer, memSegScorer)));
380380
}
381381

0 commit comments

Comments
 (0)