svn commit: r1055678 - /lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java

[mi...@apache.org]

Author: mikemccand
Date: Wed Jan  5 22:56:53 2011
New Revision: 1055678

URL: http://svn.apache.org/viewvc?rev=1055678&view=rev
Log:
LUCENE-2814: add missing merge.info.setHasVectors after merge

Modified:
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1055678&r1=1055677&r2=1055678&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java Wed Jan  5 22:56:53 2011
@@ -2961,10 +2961,6 @@ public class IndexWriter implements Clos
    * or {@link #optimize} afterwards.
    * 
    * <p>
-   * <b>NOTE:</b> if you add indexes that used different codecs that are used
-   * by this IndexWriter, make sure you update this IndexWriter to recognize
-   * them.
-   * 
    * <p>This requires this index not be among those to be added.
    *
    * <p>
@@ -3871,6 +3867,7 @@ public class IndexWriter implements Clos
       message("merging " + merge.segString(directory) + " mergeVectors=" + merge.info.getHasVectors());
     }
 
+    merge.info.setHasVectors(merger.fieldInfos().hasVectors());
     merge.readers = new SegmentReader[numSegments];
     merge.readersClone = new SegmentReader[numSegments];
 
@@ -3909,8 +3906,12 @@ public class IndexWriter implements Clos
 
       assert mergedDocCount == totDocCount;
 
+      if (infoStream != null) {
+        message("merge store matchedCount=" + merger.getMatchedSubReaderCount() + " vs " + numSegments);
+      }
+
       // Very important to do this before opening the reader
-      // because codec must know if prox was written for
+      // because SegmentReader must know if prox was written for
       // this segment:
       merge.info.setHasProx(merger.fieldInfos().hasProx());