(lucene) branch main updated: Adjust expectations of TestTopFieldCollectorEarlyTermination after #13943.

[jp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jpountz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 539cf3c9a33 Adjust expectations of TestTopFieldCollectorEarlyTermination after #13943.
539cf3c9a33 is described below

commit 539cf3c9a335bccb50a0bddbf8cabd2738727528
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Tue Nov 5 23:52:56 2024 +0100

    Adjust expectations of TestTopFieldCollectorEarlyTermination after #13943.
---
 .../TestTopFieldCollectorEarlyTermination.java     | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
index 1540d77270c..52f313b3dfd 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollectorEarlyTermination.java
@@ -29,9 +29,10 @@ import org.apache.lucene.document.NumericDocValuesField;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SerialMergeScheduler;
 import org.apache.lucene.index.Term;
+import org.apache.lucene.search.IndexSearcher.LeafReaderContextPartition;
+import org.apache.lucene.search.IndexSearcher.LeafSlice;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.tests.analysis.MockAnalyzer;
 import org.apache.lucene.tests.index.MockRandomMergePolicy;
@@ -39,6 +40,7 @@ import org.apache.lucene.tests.index.RandomIndexWriter;
 import org.apache.lucene.tests.search.CheckHits;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.apache.lucene.tests.util.TestUtil;
+import org.apache.lucene.util.Bits;
 
 public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase {
 
@@ -119,12 +121,22 @@ public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase {
     final int iters = atLeast(1);
     for (int i = 0; i < iters; ++i) {
       createRandomIndex(false);
-      int maxSegmentSize = 0;
-      for (LeafReaderContext ctx : reader.leaves()) {
-        maxSegmentSize = Math.max(ctx.reader().numDocs(), maxSegmentSize);
-      }
       for (int j = 0; j < iters; ++j) {
         final IndexSearcher searcher = newSearcher(reader);
+        int maxSliceSize = 0;
+        for (LeafSlice slice : searcher.getSlices()) {
+          int numDocs = 0; // number of live docs in the slice
+          for (LeafReaderContextPartition partition : slice.partitions) {
+            Bits liveDocs = partition.ctx.reader().getLiveDocs();
+            int maxDoc = Math.min(partition.maxDocId, partition.ctx.reader().maxDoc());
+            for (int doc = partition.minDocId; doc < maxDoc; ++doc) {
+              if (liveDocs == null || liveDocs.get(doc)) {
+                numDocs++;
+              }
+            }
+          }
+          maxSliceSize = Math.max(maxSliceSize, numDocs);
+        }
         final int numHits = TestUtil.nextInt(random(), 1, numDocs);
         FieldDoc after;
         if (paging) {
@@ -149,7 +161,7 @@ public class TestTopFieldCollectorEarlyTermination extends LuceneTestCase {
         TopDocs td2 = searcher.search(query, manager2);
 
         assertNotEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, td1.totalHits.relation());
-        if (paging == false && maxSegmentSize > numHits && query instanceof MatchAllDocsQuery) {
+        if (paging == false && maxSliceSize > numHits && query instanceof MatchAllDocsQuery) {
           // Make sure that we sometimes early terminate
           assertEquals(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO, td2.totalHits.relation());
         }