Skip to content

Specialise the wrapping of vector scorer iterator for KnnVectorValues.DocIndexIterator in ExitableDirectoryReader #131623

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

Merged
ChrisHegarty merged 1 commit into from
Jul 21, 2025
Merged

Specialise the wrapping of vector scorer iterator for KnnVectorValues.DocIndexIterator in ExitableDirectoryReader #131623

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
15 changes: 13 additions & 2 deletions server/src/main/java/org/elasticsearch/search/internal/ExitableDirectoryReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,9 @@ public VectorScorer scorer(byte[] bytes) throws IOException {
if (scorer == null) {
return null;
}
DocIdSetIterator scorerIterator = scorer.iterator();
return new VectorScorer() {
private final DocIdSetIterator iterator = new ExitableDocSetIterator(scorer.iterator(), queryCancellation);
private final DocIdSetIterator iterator = exitableIterator(scorerIterator, queryCancellation);

@Override
public float score() throws IOException {
Expand Down Expand Up @@ -637,8 +638,9 @@ public VectorScorer scorer(float[] target) throws IOException {
if (scorer == null) {
return null;
}
DocIdSetIterator scorerIterator = scorer.iterator();
return new VectorScorer() {
private final DocIdSetIterator iterator = new ExitableDocSetIterator(scorer.iterator(), queryCancellation);
private final DocIdSetIterator iterator = exitableIterator(scorerIterator, queryCancellation);

@Override
public float score() throws IOException {
Expand All @@ -663,6 +665,15 @@ public FloatVectorValues copy() throws IOException {
}
}

/** Wraps the iterator in an exitable iterator, specializing for KnnVectorValues.DocIndexIterator. */
static DocIdSetIterator exitableIterator(DocIdSetIterator iterator, QueryCancellation queryCancellation) {
if (iterator instanceof KnnVectorValues.DocIndexIterator docIndexIterator) {
return createExitableIterator(docIndexIterator, queryCancellation);
} else {
return new ExitableDocSetIterator(iterator, queryCancellation);
}
}

private static KnnVectorValues.DocIndexIterator createExitableIterator(
KnnVectorValues.DocIndexIterator delegate,
QueryCancellation queryCancellation
Expand Down