msokolov commented on code in PR #14226:
URL: https://github.com/apache/lucene/pull/14226#discussion_r2050520231
##########
lucene/core/src/java/org/apache/lucene/search/AbstractKnnVectorQuery.java:
##########
@@ -93,22 +100,62 @@ public Query rewrite(IndexSearcher indexSearcher) throws
IOException {
new TimeLimitingKnnCollectorManager(
getKnnCollectorManager(k, indexSearcher),
indexSearcher.getTimeout());
TaskExecutor taskExecutor = indexSearcher.getTaskExecutor();
- List<LeafReaderContext> leafReaderContexts = reader.leaves();
+ List<LeafReaderContext> leafReaderContexts = new
ArrayList<>(reader.leaves());
List<Callable<TopDocs>> tasks = new ArrayList<>(leafReaderContexts.size());
for (LeafReaderContext context : leafReaderContexts) {
tasks.add(() -> searchLeaf(context, filterWeight, knnCollectorManager));
}
- TopDocs[] perLeafResults =
taskExecutor.invokeAll(tasks).toArray(TopDocs[]::new);
-
- // Merge sort the results
- TopDocs topK = mergeLeafResults(perLeafResults);
+ Map<Integer, TopDocs> perLeafResults = new HashMap<>();
+ TopDocs topK = runSearchTasks(tasks, taskExecutor, perLeafResults,
leafReaderContexts);
+ int reentryCount = 0;
+ if (topK.scoreDocs.length > 0 && perLeafResults.size() > 1) {
+ float minTopKScore = topK.scoreDocs[topK.scoreDocs.length - 1].score;
+ TimeLimitingKnnCollectorManager knnCollectorManagerInner =
+ new TimeLimitingKnnCollectorManager(
+ new ReentrantKnnCollectorManager(
+ getKnnCollectorManager(k, indexSearcher), perLeafResults),
Review Comment:
right! duh - I just collapsed all the code, haven't had a chance to retest
w/luceneutil. Thanks for checking! This is hard to unit test, grr
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
