svn commit: r1666741 - in /lucene/dev/trunk/lucene: CHANGES.txt core/src/java/org/apache/lucene/index/SegmentMerger.java

[mi...@apache.org]

Author: mikemccand
Date: Sat Mar 14 20:22:49 2015
New Revision: 1666741

URL: http://svn.apache.org/r1666741
Log:
LUCENE-6355: also log time to write FieldInfos during merge to IW's infoStream

Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1666741&r1=1666740&r2=1666741&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sat Mar 14 20:22:49 2015
@@ -59,6 +59,9 @@ New Features
 
 * LUCENE-6341: Add a -fast option to CheckIndex. (Robert Muir)
 
+* LUCENE-6355: IndexWriter's infoStream now also logs time to write FieldInfos
+  during merge (Lee Hinman via Mike McCandless)
+
 Bug Fixes
 
 * LUCENE-6249: StandardQueryParser doesn't support pure negative clauses. 

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1666741&r1=1666740&r2=1666741&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java Sat Mar 14 20:22:49 2015
@@ -133,7 +133,14 @@ final class SegmentMerger {
     }
     
     // write the merged infos
+    if (mergeState.infoStream.isEnabled("SM")) {
+      t0 = System.nanoTime();
+    }
     codec.fieldInfosFormat().write(directory, mergeState.segmentInfo, "", mergeState.mergeFieldInfos, context);
+    if (mergeState.infoStream.isEnabled("SM")) {
+      long t1 = System.nanoTime();
+      mergeState.infoStream.message("SM", ((t1-t0)/1000000) + " msec to write field infos [" + numMerged + " docs]");
+    }
 
     return mergeState;
   }