msokolov commented on code in PR #951: URL: https://github.com/apache/lucene/pull/951#discussion_r908461540
########## lucene/core/src/java/org/apache/lucene/search/KnnVectorQuery.java: ########## @@ -92,20 +91,40 @@ public KnnVectorQuery(String field, float[] target, int k, Query filter) { public Query rewrite(IndexReader reader) throws IOException { TopDocs[] perLeafResults = new TopDocs[reader.leaves().size()]; - BitSetCollector filterCollector = null; + Weight filterWeight = null; if (filter != null) { - filterCollector = new BitSetCollector(reader.leaves().size()); IndexSearcher indexSearcher = new IndexSearcher(reader); BooleanQuery booleanQuery = new BooleanQuery.Builder() .add(filter, BooleanClause.Occur.FILTER) .add(new FieldExistsQuery(field), BooleanClause.Occur.FILTER) .build(); - indexSearcher.search(booleanQuery, filterCollector); + Query rewritten = indexSearcher.rewrite(booleanQuery); + filterWeight = indexSearcher.createWeight(rewritten, ScoreMode.COMPLETE_NO_SCORES, 1f); } for (LeafReaderContext ctx : reader.leaves()) { - TopDocs results = searchLeaf(ctx, filterCollector); + Bits acceptDocs; + int cost; + if (filterWeight != null) { + Scorer scorer = filterWeight.scorer(ctx); + if (scorer != null) { + DocIdSetIterator iterator = scorer.iterator(); + if (iterator instanceof BitSetIterator) { + acceptDocs = ((BitSetIterator) iterator).getBitSet(); + } else { + acceptDocs = BitSet.of(iterator, ctx.reader().maxDoc()); + } + cost = (int) iterator.cost(); Review Comment: Could we apply the optimization using liveDocs in the case that it *is* a FixedBitSet? can we tell? -- 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: issues-unsubscr...@lucene.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org