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/12/08 21:20:42 UTC

svn commit: r1212085 - in /lucene/dev/trunk: ./ lucene/ lucene/CHANGES.txt lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java

Author: mikemccand
Date: Thu Dec  8 20:20:42 2011
New Revision: 1212085

URL: http://svn.apache.org/viewvc?rev=1212085&view=rev
Log:
LUCENE-3627: don't corrupt index from an errant 0-byte segments_N

Added:
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
      - copied, changed from r1212063, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
Modified:
    lucene/dev/trunk/   (props changed)
    lucene/dev/trunk/lucene/   (props changed)
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1212085&r1=1212084&r2=1212085&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Dec  8 20:20:42 2011
@@ -676,6 +676,13 @@ Bug fixes
   to correctly respect deletions on reopened SegmentReaders. Factored out
   FieldCacheDocIdSet to be a top-level class.  (Uwe Schindler, Simon Willnauer)
 
+* LUCENE-3627: Don't let an errant 0-byte segments_N file corrupt the index.
+  (Ken McCracken via Mike McCandless)
+
+Documentation
+
+* LUCENE-3597: Fixed incorrect grouping documentation. (Martijn van Groningen, Robert Muir)
+
 Build
 
 * LUCENE-3228: Stop downloading external javadoc package-list files:

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1212085&r1=1212084&r2=1212085&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java Thu Dec  8 20:20:42 2011
@@ -179,7 +179,7 @@ final class IndexFileDeleter {
             }
             sis = null;
           } catch (IOException e) {
-            if (SegmentInfos.generationFromSegmentsFileName(fileName) <= currentGen) {
+            if (SegmentInfos.generationFromSegmentsFileName(fileName) <= currentGen && directory.fileLength(fileName) > 0) {
               throw e;
             } else {
               // Most likely we are opening an index that

Copied: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java (from r1212063, lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java?p2=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java&p1=lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java&r1=1212063&r2=1212085&rev=1212085&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java Thu Dec  8 20:20:42 2011
@@ -19,16 +19,17 @@ package org.apache.lucene.index;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collection;
 
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.document.TextField;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.LuceneTestCase;
@@ -118,7 +119,7 @@ public class TestCrashCausesCorruptIndex
    * @throws IOException
    * @throws ParseException
    */
-  private void searchForFleas(final int expectedTotalHits) throws IOException, ParseException {
+  private void searchForFleas(final int expectedTotalHits) throws IOException {
     Directory realDirectory = newFSDirectory(path);
     IndexReader indexReader = IndexReader.open(realDirectory);
     IndexSearcher indexSearcher = newSearcher(indexReader);
@@ -137,7 +138,7 @@ public class TestCrashCausesCorruptIndex
    */
   private Document getDocument() {
     Document document = new Document();
-    document.add(newField(TEXT_FIELD, "my dog has fleas", Index.ANALYZED));
+    document.add(newField(TEXT_FIELD, "my dog has fleas", TextField.TYPE_UNSTORED));
     return document;
   }
     
@@ -186,8 +187,8 @@ public class TestCrashCausesCorruptIndex
      * {@inheritDoc}
      */
     @Override
-    public IndexOutput createOutput(String name) throws IOException {
-      IndexOutput indexOutput = realDirectory.createOutput(name);
+    public IndexOutput createOutput(String name, IOContext cxt) throws IOException {
+      IndexOutput indexOutput = realDirectory.createOutput(name, cxt);
       if (null != crashAfterCreateOutput && name.equals(crashAfterCreateOutput)) {
         // CRASH!
         indexOutput.close();
@@ -244,16 +245,16 @@ public class TestCrashCausesCorruptIndex
      * {@inheritDoc}
      */
     @Override
-    public IndexInput openInput(String name) throws IOException {
-      return realDirectory.openInput(name);
+    public IndexInput openInput(String name, IOContext cxt) throws IOException {
+      return realDirectory.openInput(name, cxt);
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public void touchFile(String name) throws IOException {
-      realDirectory.touchFile(name);
+    public void sync(Collection<String> names) throws IOException {
+      realDirectory.sync(names);
     }
   }
 }