Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug where off-heap scorer would kick on even for float vectors #13850

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Fix bug where off-heap scorer would kick on even for float vectors #13850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ava21/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentByteVectorScorer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.lang.foreign.MemorySegment;
import java.util.Optional;
import org.apache.lucene.index.ByteVectorValues;
import org.apache.lucene.index.KnnVectorValues;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.store.FilterIndexInput;
Expand All @@ -40,6 +41,7 @@ abstract sealed class Lucene99MemorySegmentByteVectorScorer
*/
public static Optional<Lucene99MemorySegmentByteVectorScorer> create(
VectorSimilarityFunction type, IndexInput input, KnnVectorValues values, byte[] queryVector) {
assert values instanceof ByteVectorValues;
input = FilterIndexInput.unwrapOnlyTest(input);
if (!(input instanceof MemorySegmentAccessInput msInput)) {
return Optional.empty();
Expand Down
2 changes: 2 additions & 0 deletions ...g/apache/lucene/internal/vectorization/Lucene99MemorySegmentByteVectorScorerSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.IOException;
import java.lang.foreign.MemorySegment;
import java.util.Optional;
import org.apache.lucene.index.ByteVectorValues;
import org.apache.lucene.index.KnnVectorValues;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.store.FilterIndexInput;
Expand All @@ -42,6 +43,7 @@ public abstract sealed class Lucene99MemorySegmentByteVectorScorerSupplier
*/
static Optional<RandomVectorScorerSupplier> create(
VectorSimilarityFunction type, IndexInput input, KnnVectorValues values) {
assert values instanceof ByteVectorValues;
input = FilterIndexInput.unwrapOnlyTest(input);
if (!(input instanceof MemorySegmentAccessInput msInput)) {
return Optional.empty();
Expand Down
7 changes: 5 additions & 2 deletions ...va21/org/apache/lucene/internal/vectorization/Lucene99MemorySegmentFlatVectorsScorer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.lucene.codecs.hnsw.DefaultFlatVectorScorer;
import org.apache.lucene.codecs.hnsw.FlatVectorsScorer;
import org.apache.lucene.codecs.lucene95.HasIndexSlice;
import org.apache.lucene.index.ByteVectorValues;
import org.apache.lucene.index.KnnVectorValues;
import org.apache.lucene.index.VectorSimilarityFunction;
import org.apache.lucene.util.hnsw.RandomVectorScorer;
Expand All @@ -43,7 +44,8 @@ public RandomVectorScorerSupplier getRandomVectorScorerSupplier(
// a quantized values here is a wrapping or delegation issue
assert !(vectorValues instanceof QuantizedByteVectorValues);
// currently only supports binary vectors
if (vectorValues instanceof HasIndexSlice byteVectorValues
if (vectorValues instanceof ByteVectorValues bvv
&& bvv instanceof HasIndexSlice byteVectorValues
&& byteVectorValues.getSlice() != null) {
var scorer =
Lucene99MemorySegmentByteVectorScorerSupplier.create(
Expand All @@ -70,7 +72,8 @@ public RandomVectorScorer getRandomVectorScorer(
checkDimensions(queryVector.length, vectorValues.dimension());
// a quantized values here is a wrapping or delegation issue
assert !(vectorValues instanceof QuantizedByteVectorValues);
if (vectorValues instanceof HasIndexSlice byteVectorValues
if (vectorValues instanceof ByteVectorValues bvv
&& bvv instanceof HasIndexSlice byteVectorValues
&& byteVectorValues.getSlice() != null) {
var scorer =
Lucene99MemorySegmentByteVectorScorer.create(
Expand Down