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 2015/05/01 11:41:47 UTC
svn commit: r1677104 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/index/IndexFileDeleter.java
test/org/apache/lucene/index/TestIndexWriter.java
Author: mikemccand
Date: Fri May 1 09:41:46 2015
New Revision: 1677104
URL: http://svn.apache.org/r1677104
Log:
remove obsolete fileLength call in IndexFileDeleter: crashes during commit no longer result in 0-length segments_N files
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1677104&r1=1677103&r2=1677104&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java Fri May 1 09:41:46 2015
@@ -143,8 +143,6 @@ final class IndexFileDeleter implements
// First pass: walk the files and initialize our ref
// counts:
- long currentGen = segmentInfos.getGeneration();
-
CommitPoint currentCommitPoint = null;
String[] files = directory.listAll();
@@ -179,14 +177,6 @@ final class IndexFileDeleter implements
if (infoStream.isEnabled("IFD")) {
infoStream.message("IFD", "init: hit FileNotFoundException when loading commit \"" + fileName + "\"; skipping this commit point");
}
- } catch (IOException e) {
- if (SegmentInfos.generationFromSegmentsFileName(fileName) <= currentGen && directory.fileLength(fileName) > 0) {
- throw e;
- } else {
- // Most likely we are opening an index that
- // has an aborted "future" commit, so suppress
- // exc in this case
- }
}
if (sis != null) {
final CommitPoint commitPoint = new CommitPoint(commitsToDelete, directory, sis);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1677104&r1=1677103&r2=1677104&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Fri May 1 09:41:46 2015
@@ -73,7 +73,6 @@ import org.apache.lucene.store.RAMDirect
import org.apache.lucene.store.SimpleFSLockFactory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.Constants;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.LuceneTestCase;
@@ -2321,7 +2320,9 @@ public class TestIndexWriter extends Luc
BaseDirectoryWrapper dir = newDirectory();
// Create a corrupt first commit:
- dir.createOutput("segments_0", IOContext.DEFAULT).close();
+ dir.createOutput(IndexFileNames.fileNameFromGeneration(IndexFileNames.PENDING_SEGMENTS,
+ "",
+ 0), IOContext.DEFAULT).close();
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
int mode = i/2;
@@ -2343,9 +2344,6 @@ public class TestIndexWriter extends Luc
} else {
new IndexWriter(dir, iwc).rollback();
}
- if (mode != 0) {
- fail("expected exception");
- }
} catch (IOException ioe) {
// OpenMode.APPEND should throw an exception since no
// index exists: