Skip to content

Apache Lucene open-source search software

Don't perform additional KNN querying after timeout, fixes #14639 (#14640)

Michael Sokolov92e0eb8f71e2
diff --git a/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java b/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
index 998495836ff..5d203ca1a39 100644
--- a/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java
@@ -109,7 +109,10 @@ abstract class AbstractKnnVectorQuery extends Query {
Map<Integer, TopDocs> perLeafResults = new HashMap<>();
TopDocs topK = runSearchTasks(tasks, taskExecutor, perLeafResults, leafReaderContexts);
int reentryCount = 0;
- if (topK.scoreDocs.length > 0 && perLeafResults.size() > 1) {
+ if (topK.scoreDocs.length > 0
+ && perLeafResults.size() > 1
+ // don't re-enter the search if we early terminated
+ && topK.totalHits.relation() == TotalHits.Relation.EQUAL_TO) {
float minTopKScore = topK.scoreDocs[topK.scoreDocs.length - 1].score;
TimeLimitingKnnCollectorManager knnCollectorManagerInner =
new TimeLimitingKnnCollectorManager(