You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/11/15 01:12:32 UTC

svn commit: r1201973 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/SegmentMerger.java test-framework/java/org/apache/lucene/index/RandomIndexWriter.java test/org/apache/lucene/index/TestAddIndexes.java

Author: mikemccand
Date: Tue Nov 15 00:12:32 2011
New Revision: 1201973

URL: http://svn.apache.org/viewvc?rev=1201973&view=rev
Log:
LUCENE-3575: SegmentMerger sometimes thought bulk merge was safe when it wasn't

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1201973&r1=1201972&r2=1201973&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Tue Nov 15 00:12:32 2011
@@ -193,7 +193,10 @@ final class SegmentMerger {
         boolean same = true;
         FieldInfos segmentFieldInfos = segmentReader.fieldInfos();
         for (FieldInfo fi : segmentFieldInfos) {
-          same = mergeState.fieldInfos.fieldName(fi.number).equals(fi.name);
+          if (!mergeState.fieldInfos.fieldName(fi.number).equals(fi.name)) {
+            same = false;
+            break;
+          }
         }
         if (same) {
           mergeState.matchingSegmentReaders[i] = segmentReader;

Modified: lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1201973&r1=1201972&r2=1201973&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java Tue Nov 15 00:12:32 2011
@@ -293,6 +293,10 @@ public class RandomIndexWriter implement
   public void addIndexes(Directory... dirs) throws CorruptIndexException, IOException {
     w.addIndexes(dirs);
   }
+
+  public void addIndexes(IndexReader... readers) throws CorruptIndexException, IOException {
+    w.addIndexes(readers);
+  }
   
   public void deleteDocuments(Term term) throws CorruptIndexException, IOException {
     w.deleteDocuments(term);

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1201973&r1=1201972&r2=1201973&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestAddIndexes.java Tue Nov 15 00:12:32 2011
@@ -1216,4 +1216,51 @@ public class TestAddIndexes extends Luce
     toAdd.close();
   }
 
+  // LUCENE-3575
+  public void testFieldNamesChanged() throws IOException {
+    Directory d1 = newDirectory();
+    RandomIndexWriter w = new RandomIndexWriter(random, d1);
+    Document doc = new Document();
+    doc.add(newField("f1", "doc1 field1", StringField.TYPE_STORED));
+    doc.add(newField("id", "1", StringField.TYPE_STORED));
+    //doc.add(newField("f7", "doc1 field7", StringField.TYPE_STORED));
+    w.addDocument(doc);
+    IndexReader r1 = w.getReader();
+    w.close();
+
+    Directory d2 = newDirectory();
+    w = new RandomIndexWriter(random, d2);
+    doc = new Document();
+    doc.add(newField("f2", "doc2 field2", StringField.TYPE_STORED));
+    doc.add(newField("id", "2", StringField.TYPE_STORED));
+    //doc.add(newField("f7", "doc2 field7", StringField.TYPE_STORED));
+    w.addDocument(doc);
+    IndexReader r2 = w.getReader();
+    w.close();
+
+    Directory d3 = newDirectory();
+    w = new RandomIndexWriter(random, d3);
+    w.addIndexes(r1, r2);
+    r1.close();
+    d1.close();
+    r2.close();
+    d2.close();
+
+    IndexReader r3 = w.getReader();
+    w.close();
+    System.out.println("r1=" + r1);
+    System.out.println("r2=" + r2);
+    System.out.println("r3=" + r3);
+    assertEquals(2, r3.numDocs());
+    for(int docID=0;docID<2;docID++) {
+      Document d = r3.document(docID);
+      if (d.get("id").equals("1")) {
+        assertEquals("doc1 field1", d.get("f1"));
+      } else {
+        assertEquals("doc2 field2", d.get("f2"));
+      }
+    }
+    r3.close();
+    d3.close();
+  } 
 }