svn commit: r1648221 - in /lucene/dev/trunk/lucene/core/src: java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java

[rm...@apache.org]

Author: rmuir
Date: Sun Dec 28 15:55:07 2014
New Revision: 1648221

URL: http://svn.apache.org/r1648221
Log:
LUCENE-6141: simplify stored fields bulk merge logic

Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java?rev=1648221&r1=1648220&r2=1648221&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java Sun Dec 28 15:55:07 2014
@@ -486,10 +486,8 @@ public final class CompressingStoredFiel
       final int maxDoc = mergeState.maxDocs[readerIndex];
       final Bits liveDocs = mergeState.liveDocs[readerIndex];
 
-      if (matchingFieldsReader == null
-          || matchingFieldsReader.getVersion() != VERSION_CURRENT // means reader version is not the same as the writer version
-          || matchingFieldsReader.getCompressionMode() != compressionMode
-          || matchingFieldsReader.getChunkSize() != chunkSize) { // the way data is decompressed depends on the chunk size
+      // if its some other format, or an older version of this format:
+      if (matchingFieldsReader == null || matchingFieldsReader.getVersion() != VERSION_CURRENT) {
         // naive merge...
         StoredFieldsReader storedFieldsReader = mergeState.storedFieldsReaders[readerIndex];
         if (storedFieldsReader != null) {

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java?rev=1648221&r1=1648220&r2=1648221&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java Sun Dec 28 15:55:07 2014
@@ -25,6 +25,7 @@ import org.apache.lucene.index.BaseStore
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.StoredDocument;
 import org.apache.lucene.store.Directory;
 
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -58,6 +59,11 @@ public class TestLucene50StoredFieldsFor
     
     DirectoryReader ir = DirectoryReader.open(dir);
     assertEquals(10, ir.numDocs());
+    for (int i = 0; i < 10; i++) {
+      StoredDocument doc = ir.document(i);
+      assertEquals("value1", doc.get("field1"));
+      assertEquals("value2", doc.get("field2"));
+    }
     ir.close();
     // checkindex
     dir.close();