Skip to content

Commit

Permalink
Make the HitQueue size more appropriate for exact search (#1549)
Browse files Browse the repository at this point in the history
Signed-off-by: panguixin <[email protected]>
  • Loading branch information
bugmakerrrrrr authored Mar 27, 2024
1 parent 17bbbd9 commit c861966
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased 2.x](https://github.com/opensearch-project/k-NN/compare/2.13...2.x)
### Features
### Enhancements
* Make the HitQueue size more appropriate for exact search [#1549](https://github.com/opensearch-project/k-NN/pull/1549)
### Bug Fixes
### Infrastructure
### Documentation
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/opensearch/knn/index/query/KNNWeight.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public Scorer scorer(LeafReaderContext context) throws IOException {
* This improves the recall.
*/
if (filterWeight != null && canDoExactSearch(cardinality)) {
docIdsToScoreMap.putAll(doExactSearch(context, filterBitSet));
docIdsToScoreMap.putAll(doExactSearch(context, filterBitSet, cardinality));
} else {
Map<Integer, Float> annResults = doANNSearch(context, filterBitSet, cardinality);
if (annResults == null) {
Expand All @@ -131,7 +131,7 @@ public Scorer scorer(LeafReaderContext context) throws IOException {
annResults.size(),
cardinality
);
annResults = doExactSearch(context, filterBitSet);
annResults = doExactSearch(context, filterBitSet, cardinality);
}
docIdsToScoreMap.putAll(annResults);
}
Expand Down Expand Up @@ -309,10 +309,10 @@ private Map<Integer, Float> doANNSearch(final LeafReaderContext context, final B
.collect(Collectors.toMap(KNNQueryResult::getId, result -> knnEngine.score(result.getScore(), spaceType)));
}

private Map<Integer, Float> doExactSearch(final LeafReaderContext leafReaderContext, final BitSet filterIdsBitSet) {
private Map<Integer, Float> doExactSearch(final LeafReaderContext leafReaderContext, final BitSet filterIdsBitSet, int cardinality) {
try {
// Creating min heap and init with MAX DocID and Score as -INF.
final HitQueue queue = new HitQueue(this.knnQuery.getK(), true);
final HitQueue queue = new HitQueue(Math.min(this.knnQuery.getK(), cardinality), true);
ScoreDoc topDoc = queue.top();
final Map<Integer, Float> docToScore = new HashMap<>();
FilteredIdsKNNIterator iterator = getFilteredKNNIterator(leafReaderContext, filterIdsBitSet);
Expand Down

0 comments on commit c861966

Please sign in to comment.