Skip to content

Remove BulkVectorScorer implementations #135440

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

Closed
wants to merge 1 commit into from
+16 −35
Closed

Remove BulkVectorScorer implementations #135440

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
10 changes: 6 additions & 4 deletions server/src/main/java/org/elasticsearch/index/codec/vectors/BulkScorableByteVectorValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,23 @@

package org.elasticsearch.index.codec.vectors;

import org.apache.lucene.search.VectorScorer;

import java.io.IOException;

/**
* Extension to {@link BulkScorableVectorValues} for byte[] vectors
*/
public interface BulkScorableByteVectorValues extends BulkScorableVectorValues {
/**
* Returns a {@link BulkVectorScorer} that can score against the provided {@code target} vector.
* Returns a {@link VectorScorer} that can score against the provided {@code target} vector.
* It will score to the fastest speed possible, potentially sacrificing some fidelity.
*/
BulkVectorScorer scorer(byte[] target) throws IOException;
VectorScorer scorer(byte[] target) throws IOException;

/**
* Returns a {@link BulkVectorScorer} that can rescore against the provided {@code target} vector.
* Returns a {@link VectorScorer} that can rescore against the provided {@code target} vector.
* It will score to the highest fidelity possible, potentially sacrificing some speed.
*/
BulkVectorScorer rescorer(byte[] target) throws IOException;
VectorScorer rescorer(byte[] target) throws IOException;
}
10 changes: 6 additions & 4 deletions ...er/src/main/java/org/elasticsearch/index/codec/vectors/BulkScorableFloatVectorValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,23 @@

package org.elasticsearch.index.codec.vectors;

import org.apache.lucene.search.VectorScorer;

import java.io.IOException;

/**
* Extension to {@link BulkScorableVectorValues} for byte[] vectors
*/
public interface BulkScorableFloatVectorValues extends BulkScorableVectorValues {
/**
* Returns a {@link BulkVectorScorer} that can score against the provided {@code target} vector.
* Returns a {@link VectorScorer} that can score against the provided {@code target} vector.
* It will score to the fastest speed possible, potentially sacrificing some fidelity.
*/
BulkVectorScorer scorer(float[] target) throws IOException;
VectorScorer scorer(float[] target) throws IOException;

/**
* Returns a {@link BulkVectorScorer} that can rescore against the provided {@code target} vector.
* Returns a {@link VectorScorer} that can rescore against the provided {@code target} vector.
* It will score to the highest fidelity possible, potentially sacrificing some speed.
*/
BulkVectorScorer rescorer(float[] target) throws IOException;
VectorScorer rescorer(float[] target) throws IOException;
}
25 changes: 1 addition & 24 deletions server/src/main/java/org/elasticsearch/index/codec/vectors/BulkScorableVectorValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,7 @@

package org.elasticsearch.index.codec.vectors;

import org.apache.lucene.search.DocAndFloatFeatureBuffer;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.VectorScorer;
import org.apache.lucene.util.Bits;

import java.io.IOException;

/**
* Extension to {@link org.apache.lucene.search.VectorScorer} that can score in bulk
*/
public interface BulkScorableVectorValues {
interface BulkVectorScorer extends VectorScorer {

/**
* Returns a {@link Bulk} scorer that can score in bulk the provided {@code matchingDocs}.
*/
Bulk bulk(DocIdSetIterator matchingDocs) throws IOException;

interface Bulk {
/**
* Scores up to {@code nextCount} docs in the provided {@code buffer}.
* Returns the maxScore of docs scored.
*/
float nextDocsAndScores(int nextCount, Bits liveDocs, DocAndFloatFeatureBuffer buffer) throws IOException;
}
}
}
public interface BulkScorableVectorValues {}
6 changes: 3 additions & 3 deletions server/src/main/java/org/elasticsearch/search/vectors/RescoreKnnVectorQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.VectorScorer;
import org.elasticsearch.index.codec.vectors.BulkScorableFloatVectorValues;
import org.elasticsearch.index.codec.vectors.BulkScorableVectorValues;
import org.elasticsearch.search.profile.query.QueryProfiler;

import java.io.IOException;
Expand Down Expand Up @@ -317,9 +317,9 @@ private void rescoreBulk(
List<ScoreDoc> queue,
DocIdSetIterator filterIterator
) throws IOException {
BulkScorableVectorValues.BulkVectorScorer vectorReScorer = rescorableVectorValues.rescorer(floatTarget);
VectorScorer vectorReScorer = rescorableVectorValues.rescorer(floatTarget);
var iterator = vectorReScorer.iterator();
BulkScorableVectorValues.BulkVectorScorer.Bulk bulkScorer = vectorReScorer.bulk(filterIterator);
VectorScorer.Bulk bulkScorer = vectorReScorer.bulk(filterIterator);
DocAndFloatFeatureBuffer buffer = new DocAndFloatFeatureBuffer();
while (iterator.docID() != DocIdSetIterator.NO_MORE_DOCS) {
// iterator already takes live docs into account
Expand Down