You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2024/09/03 10:32:16 UTC

(lucene) 03/03: Limit max num partitions per segment

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

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

commit c9d52afccfe90162535859696792e56227f15fa0
Author: Luca Cavanna <ja...@apache.org>
AuthorDate: Tue Sep 3 12:31:44 2024 +0200

    Limit max num partitions per segment
---
 lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java | 4 ++--
 .../test/org/apache/lucene/index/TestSegmentToThreadMapping.java | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
index 54d187465fe..ef1f231c8a6 100644
--- a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
+++ b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
@@ -408,9 +408,9 @@ public class IndexSearcher {
     for (LeafReaderContext ctx : sortedLeaves) {
       if (ctx.reader().maxDoc() > maxDocsPerSlice) {
         assert group == null;
-        // if the segment does not fit in a single slice, we split it in multiple partitions of
+        // if the segment does not fit in a single slice, we split it into maximum 5 partitions of
         // equal size
-        int numSlices = Math.ceilDiv(ctx.reader().maxDoc(), maxDocsPerSlice);
+        int numSlices = Math.min(5, Math.ceilDiv(ctx.reader().maxDoc(), maxDocsPerSlice));
         int numDocs = ctx.reader().maxDoc() / numSlices;
         int maxDocId = numDocs;
         int minDocId = 0;
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java
index 3a9b476cb41..7c42220023f 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentToThreadMapping.java
@@ -363,9 +363,14 @@ public class TestSegmentToThreadMapping extends LuceneTestCase {
     IndexSearcher.LeafSlice[] resultSlices =
         IndexSearcher.slicesWithPartitions(leafReaderContexts, 1, 1);
 
-    assertEquals(17, resultSlices.length);
+    assertEquals(12, resultSlices.length);
+    int i = 0;
     for (IndexSearcher.LeafSlice leafSlice : resultSlices) {
-      assertEquals(1, leafSlice.getMaxDocs());
+      if (i++ > 4) {
+        assertEquals(1, leafSlice.getMaxDocs());
+      } else {
+        assertEquals(2, leafSlice.getMaxDocs());
+      }
       assertEquals(1, leafSlice.partitions.length);
     }
   }