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 2014/01/31 21:39:48 UTC

svn commit: r1563251 - in /lucene/dev/trunk/lucene/core/src: java/org/apache/lucene/codecs/lucene45/ test/org/apache/lucene/index/

Author: mikemccand
Date: Fri Jan 31 20:39:48 2014
New Revision: 1563251

URL: http://svn.apache.org/r1563251
Log:
add 45 indices to TestBackCompat; fix back-compat bug in Lucene45DVProducer

Added:
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.45.cfs.zip
      - copied unchanged from r1563119, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.45.cfs.zip
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.45.nocfs.zip
      - copied unchanged from r1563119, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.45.nocfs.zip
Modified:
    lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
    lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java

Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java?rev=1563251&r1=1563250&r2=1563251&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene45/Lucene45DocValuesProducer.java Fri Jan 31 20:39:48 2014
@@ -104,7 +104,7 @@ public class Lucene45DocValuesProducer e
       String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, dataExtension);
       data = state.directory.openInput(dataName, state.context);
       final int version2 = CodecUtil.checkHeader(data, dataCodec, 
-                                                 Lucene45DocValuesFormat.VERSION_CURRENT,
+                                                 Lucene45DocValuesFormat.VERSION_START,
                                                  Lucene45DocValuesFormat.VERSION_CURRENT);
       if (version != version2) {
         throw new CorruptIndexException("Format versions mismatch");

Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1563251&r1=1563250&r2=1563251&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Fri Jan 31 20:39:48 2014
@@ -164,8 +164,8 @@ public class TestBackwardsCompatibility 
                                     "42.cfs",
                                     "42.nocfs",
                                     // TODO: these are on 4x, but something is wrong (they seem to be a too old DV format):
-                                    //"45.cfs",
-                                    //"45.nocfs",
+                                    "45.cfs",
+                                    "45.nocfs",
                                     "461.cfs",
                                     "461.nocfs",
   };