Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't call BitSet.cardinality() more than needed (#1075)

This commit is contained in:
Michael Sokolov 2022-08-20 08:40:50 -04:00 committed by GitHub
parent f9680c6807
commit 60fa19d509
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java
View File

@ -131,20 +131,21 @@ public class KnnVectorQuery extends Query {
}
BitSet acceptDocs = createBitSet(scorer.iterator(), liveDocs, maxDoc);
int cost = acceptDocs.cardinality();
if (acceptDocs.cardinality() <= k) {
if (cost <= k) {
// If there are <= k possible matches, short-circuit and perform exact search, since HNSW
// must always visit at least k documents
return exactSearch(ctx, new BitSetIterator(acceptDocs, acceptDocs.cardinality()));
return exactSearch(ctx, new BitSetIterator(acceptDocs, cost));
}
// Perform the approximate kNN search
TopDocs results = approximateSearch(ctx, acceptDocs, acceptDocs.cardinality());
TopDocs results = approximateSearch(ctx, acceptDocs, cost);
if (results.totalHits.relation == TotalHits.Relation.EQUAL_TO) {
return results;
} else {
// We stopped the kNN search because it visited too many nodes, so fall back to exact search
return exactSearch(ctx, new BitSetIterator(acceptDocs, acceptDocs.cardinality()));
return exactSearch(ctx, new BitSetIterator(acceptDocs, cost));
}
}