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/09/22 19:17:03 UTC

svn commit: r1626845 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/ lucene/core/src/java/org/apache/lucene/util/ lucene/core/src/test/org/apache/lucene/index/

Author: mikemccand
Date: Mon Sep 22 17:17:03 2014
New Revision: 1626845

URL: http://svn.apache.org/r1626845
Log:
add 4.9.1 Version constant and back compat indices

Added:
    lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/index.491.cfs.zip   (with props)
    lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/index.491.nocfs.zip   (with props)
Modified:
    lucene/dev/branches/lucene_solr_4_10/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java
    lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1626845&r1=1626844&r2=1626845&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Mon Sep 22 17:17:03 2014
@@ -19,11 +19,6 @@ Bug fixes
   to enforce here); use simple string tokenizer.  (Ryan Ernst, Uwe Schindler,
   Robert Muir, Mike McCandless)
 
-* LUCENE-5919: Fix exception handling inside IndexWriter when
-  deleteFile throws an exception, to not over-decRef index files,
-  possibly deleting a file that's still in use in the index, leading
-  to corruption.  (Mike McCandless)
-
 * LUCENE-5958: Don't let exceptions during checkpoint corrupt the index. 
   Refactor existing OOM handling too, so you don't need to handle OOM special
   for every IndexWriter method: instead such disasters will cause IW to close itself
@@ -39,8 +34,9 @@ Bug fixes
   MockDirectoryWrapper to have it simulate a virus checker holding a
   file open and preventing deletion (Robert Muir, Mike McCandless)
 
-* LUCENE-5922: DocValuesDocIdSet on 5.x and FieldCacheDocIdSet on 4.x
-  are not cacheable. (Adrien Grand)
+* LUCENE-5916: Static scope test components should be consistent between
+  tests (and test iterations). Fix for FaultyIndexInput in particular.
+  (Dawid Weiss)
 
 Tests
 
@@ -199,40 +195,14 @@ Bug Fixes
 
 * LUCENE-5824: Fix hunspell 'long' flag handling. (Robert Muir)
 
-* LUCENE-5827: Make all Directory implementations correctly fail with
-  IllegalArgumentException if slices are out of bounds.  (Uwe SChindler)
-
 * LUCENE-5838: Fix hunspell when the .aff file has over 64k affixes. (Robert Muir)
 
-* LUCENE-5844: ArrayUtil.grow/oversize now returns a maximum of
-  Integer.MAX_VALUE - 8 for the maximum array size.  (Robert Muir,
-  Mike McCandless)
-
-* LUCENE-5843: Added IndexWriter.MAX_DOCS which is the maximum number
-  of documents allowed in a single index, and any operations that add
-  documents will now throw IllegalStateException if the max count
-  would be exceeded, instead of silently creating an unusable
-  index.  (Mike McCandless)
-
 * LUCENE-5869: Added restriction to positive values for maxExpansions in
   FuzzyQuery.  (Ryan Ernst)
 
 * LUCENE-5672: IndexWriter.addIndexes() calls maybeMerge(), to ensure the index stays
   healthy. If you don't want merging use NoMergePolicy instead. (Robert Muir)
   
-* LUCENE-5897, LUCENE-5400: JFlex-based tokenizers StandardTokenizer and
-  UAX29URLEmailTokenizer tokenize extremely slowly over long sequences of
-  text partially matching certain grammar rules.  The scanner default
-  buffer size was reduced, and scanner buffer growth was disabled, resulting
-  in much, much faster tokenization for these text sequences.  
-  (Chris Geeringh, Robert Muir, Steve Rowe)
-
-* LUCENE-5907: Fix corruption case when opening a pre-4.x index with
-  IndexWriter, then opening an NRT reader from that writer, then
-  calling commit from the writer, then closing the NRT reader.  This
-  case would remove the wrong files from the index leading to a
-  corrupt index.  (Mike McCandless)
-
 * LUCENE-5908: Fix Lucene43NGramTokenizer to be final
   
 Test Framework
@@ -254,6 +224,44 @@ Build
 * SOLR-6358: Remove VcsDirectoryMappings from idea configuration 
   vcs.xml (Ramkumar Aiyengar via Steve Rowe)
 
+======================= Lucene 4.9.1 ======================
+
+Bug fixes
+
+* LUCENE-5907: Fix corruption case when opening a pre-4.x index with
+  IndexWriter, then opening an NRT reader from that writer, then
+  calling commit from the writer, then closing the NRT reader.  This
+  case would remove the wrong files from the index leading to a
+  corrupt index.  (Mike McCandless)
+
+* LUCENE-5919: Fix exception handling inside IndexWriter when
+  deleteFile throws an exception, to not over-decRef index files,
+  possibly deleting a file that's still in use in the index, leading
+  to corruption.  (Mike McCandless)
+
+* LUCENE-5922: DocValuesDocIdSet on 5.x and FieldCacheDocIdSet on 4.x
+  are not cacheable. (Adrien Grand)
+
+* LUCENE-5843: Added IndexWriter.MAX_DOCS which is the maximum number
+  of documents allowed in a single index, and any operations that add
+  documents will now throw IllegalStateException if the max count
+  would be exceeded, instead of silently creating an unusable
+  index.  (Mike McCandless)
+
+* LUCENE-5844: ArrayUtil.grow/oversize now returns a maximum of
+  Integer.MAX_VALUE - 8 for the maximum array size.  (Robert Muir,
+  Mike McCandless)
+
+* LUCENE-5827: Make all Directory implementations correctly fail with
+  IllegalArgumentException if slices are out of bounds.  (Uwe SChindler)
+
+* LUCENE-5897, LUCENE-5400: JFlex-based tokenizers StandardTokenizer and
+  UAX29URLEmailTokenizer tokenize extremely slowly over long sequences of
+  text partially matching certain grammar rules.  The scanner default
+  buffer size was reduced, and scanner buffer growth was disabled, resulting
+  in much, much faster tokenization for these text sequences.  
+  (Chris Geeringh, Robert Muir, Steve Rowe)
+
 ======================= Lucene 4.9.0 =======================
 
 Changes in Runtime Behavior

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1626845&r1=1626844&r2=1626845&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java Mon Sep 22 17:17:03 2014
@@ -215,6 +215,13 @@ public final class Version {
   public static final Version LUCENE_4_9_0 = new Version(4, 9, 0);
   
   /**
+   * Match settings and bugs in Lucene's 4.9.1 release.
+   * @deprecated (5.0) Use latest
+   */
+  @Deprecated
+  public static final Version LUCENE_4_9_1 = new Version(4, 9, 1);
+  
+  /**
    * Match settings and bugs in Lucene's 4.10 release.
    * @deprecated Use latest
    */

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1626845&r1=1626844&r2=1626845&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Mon Sep 22 17:17:03 2014
@@ -263,6 +263,8 @@ public class TestBackwardsCompatibility 
                                     "481.nocfs",
                                     "49.cfs",
                                     "49.nocfs",
+                                    "491.cfs",
+                                    "491.nocfs",
                                     "410.cfs",
                                     "410.nocfs"
   };
@@ -398,7 +400,6 @@ public class TestBackwardsCompatibility 
     }
     Collections.sort(testedVersions);
 
-
     int i = 0;
     int j = 0;
     List<String> missingFiles = new ArrayList<>();
@@ -423,7 +424,7 @@ public class TestBackwardsCompatibility 
       ++i;
     }
     while (j < testedVersions.size()) {
-      missingFiles.add(testedVersions.get(j));
+      extraFiles.add(testedVersions.get(j));
       ++j;
     }
 
@@ -434,13 +435,13 @@ public class TestBackwardsCompatibility 
 
     StringBuffer msg = new StringBuffer();
     if (missingFiles.isEmpty() == false) {
-      msg.append("Missing backcompat test files:\n");
+      msg.append("Saw Version constant but no corresponding back-compat index:\n");
       for (String missingFile : missingFiles) {
         msg.append("  " + missingFile + "\n");
       }
     }
     if (extraFiles.isEmpty() == false) {
-      msg.append("Extra backcompat test files:\n");
+      msg.append("Saw back-compat index but no corresponding Version constant:\n");
       for (String extraFile : extraFiles) {
         msg.append("  " + extraFile + "\n");
       }

Added: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/index.491.cfs.zip
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/index.491.cfs.zip?rev=1626845&view=auto
==============================================================================
Binary file - no diff available.

Added: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/index.491.nocfs.zip
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/index.491.nocfs.zip?rev=1626845&view=auto
==============================================================================
Binary file - no diff available.