Add estimatedByteSizes to merges kicked off by IndexWriter.addIndexes(CodecReader[]) (backport of #15120).

Author: dweiss

lucene/CHANGES.txt

@@ -180,6 +180,10 @@ Changes in Runtime Behavior
 
 Bug Fixes
 ---------------------
+
+* GITHUB#15120: Add estimatedByteSizes to merges kicked off by 
+  IndexWriter.addIndexes(CodecReader[]) (Craig Perkins)
+
 * GITHUB*15025: flush segments in addIndexes, not in addIndexesReaderMerge;
   reduces extra needless merge activity
 

lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

@@ -21,6 +21,7 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.time.Instant;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -3321,6 +3322,11 @@ public AddIndexesMergeSource(IndexWriter writer) {
     }
 
     public void registerMerge(MergePolicy.OneMerge merge) {
+      try {
+        addEstimatedBytesToMerge(merge);
+      } catch (IOException e) {
+        throw new UncheckedIOException(e);
+      }
       synchronized (IndexWriter.this) {
         pendingAddIndexesMerges.add(merge);
       }
@@ -4825,6 +4831,21 @@ private void abortOneMerge(MergePolicy.OneMerge merge) throws IOException {
     closeMergeReaders(merge, true, false);
   }
 
+  /** Compute {@code estimatedMergeBytes} and {@code totalMergeBytes} for a merge. */
+  void addEstimatedBytesToMerge(MergePolicy.OneMerge merge) throws IOException {
+    assert merge.estimatedMergeBytes == 0;
+    assert merge.totalMergeBytes == 0;
+    for (SegmentCommitInfo info : merge.segments) {
+      if (info.info.maxDoc() > 0) {
+        final int delCount = numDeletedDocs(info);
+        assert delCount <= info.info.maxDoc();
+        final double delRatio = ((double) delCount) / info.info.maxDoc();
+        merge.estimatedMergeBytes += (long) (info.sizeInBytes() * (1.0 - delRatio));
+        merge.totalMergeBytes += info.sizeInBytes();
+      }
+    }
+  }
+
   /**
    * Checks whether this merge involves any segments already participating in a merge. If not, this
    * merge is "registered", meaning we record that its segments are now participating in a merge,
@@ -4916,17 +4937,7 @@ private synchronized boolean registerMerge(MergePolicy.OneMerge merge) throws IO
       mergingSegments.add(info);
     }
 
-    assert merge.estimatedMergeBytes == 0;
-    assert merge.totalMergeBytes == 0;
-    for (SegmentCommitInfo info : merge.segments) {
-      if (info.info.maxDoc() > 0) {
-        final int delCount = numDeletedDocs(info);
-        assert delCount <= info.info.maxDoc();
-        final double delRatio = ((double) delCount) / info.info.maxDoc();
-        merge.estimatedMergeBytes += (long) (info.sizeInBytes() * (1.0 - delRatio));
-        merge.totalMergeBytes += info.sizeInBytes();
-      }
-    }
+    addEstimatedBytesToMerge(merge);
 
     // Merge is now registered
     merge.registerDone = true;

lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java

@@ -465,4 +465,35 @@ public void run() {
 
     directory.close();
   }
+
+  public void testAddEstimatedBytesToMerge() throws IOException {
+    try (Directory dir = newDirectory();
+        IndexWriter writer =
+            new IndexWriter(
+                dir,
+                newIndexWriterConfig(new MockAnalyzer(random()))
+                    .setMergePolicy(NoMergePolicy.INSTANCE))) {
+
+      Document doc = new Document();
+      doc.add(newTextField("field", "content", Field.Store.YES));
+
+      for (int i = 0; i < 10; i++) {
+
+        writer.addDocument(doc);
+      }
+      writer.flush();
+
+      // Create a merge with the segments
+      SegmentInfos segmentInfos = writer.cloneSegmentInfos();
+      MergePolicy.OneMerge merge = new MergePolicy.OneMerge(segmentInfos.asList());
+
+      writer.addEstimatedBytesToMerge(merge);
+
+      assertTrue(merge.estimatedMergeBytes > 0);
+
+      assertTrue(merge.totalMergeBytes > 0);
+
+      assertTrue(merge.estimatedMergeBytes <= merge.totalMergeBytes);
+    }
+  }
 }