linear iteration of bitset

shatejas · Jun 26, 2024 · 508bc3c · 508bc3c
1 parent 150c589
commit 508bc3c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/java/org/opensearch/knn/index/query/KNNWeight.java b/src/main/java/org/opensearch/knn/index/query/KNNWeight.java
@@ -143,19 +143,20 @@ public Scorer scorer(LeafReaderContext context) throws IOException {
     }
 
     private BitSet getFilteredDocsBitSet(final LeafReaderContext ctx) throws IOException {
-        if (this.filterWeight == null) {
-            return new FixedBitSet(0);
-        }
-
         final Bits liveDocs = ctx.reader().getLiveDocs();
         final int maxDoc = ctx.reader().maxDoc();
 
-        final Scorer scorer = filterWeight.scorer(ctx);
-        if (scorer == null) {
+        Scorer scorer = null;
+        if (filterWeight != null) {
+            scorer = filterWeight.scorer(ctx);
+        }
+
+        if (liveDocs == null && scorer == null) {
             return new FixedBitSet(0);
         }
 
-        return createBitSet(scorer.iterator(), liveDocs, maxDoc);
+        final DocIdSetIterator docIdSetIterator = scorer != null ? scorer.iterator() : DocIdSetIterator.all(maxDoc);
+        return createBitSet(docIdSetIterator, liveDocs, maxDoc);
     }
 
     private BitSet createBitSet(final DocIdSetIterator filteredDocIdsIterator, final Bits liveDocs, int maxDoc) throws IOException {