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 2016/12/14 23:02:13 UTC
lucene-solr:branch_6x: LUCENE-7592: if segments file is truncated,
throw CorruptIndexException
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 4c2265987 -> b4bb461c4
LUCENE-7592: if segments file is truncated, throw CorruptIndexException
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b4bb461c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b4bb461c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b4bb461c
Branch: refs/heads/branch_6x
Commit: b4bb461c4391b93d511e960208c8c4dd5e233021
Parents: 4c22659
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Dec 14 18:00:51 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Wed Dec 14 18:01:53 2016 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../core/src/java/org/apache/lucene/index/SegmentInfos.java | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b4bb461c/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 85d8e78..7ff0415 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -90,6 +90,9 @@ Improvements
necessarily refer to that field (AKA requireFieldMatch==false). Disabled by default.
See UH get/setFieldMatcher. (Jim Ferenczi via David Smiley)
+* LUCENE-7592: If the segments file is truncated, we now throw
+ CorruptIndexException instead of the more confusing EOFException
+ (Mike Drob via Mike McCandless)
Optimizations
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b4bb461c/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
index 424b12b..8426686 100644
--- a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
+++ b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
@@ -17,6 +17,7 @@
package org.apache.lucene.index;
+import java.io.EOFException;
import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -281,7 +282,11 @@ public final class SegmentInfos implements Cloneable, Iterable<SegmentCommitInfo
long generation = generationFromSegmentsFileName(segmentFileName);
//System.out.println(Thread.currentThread() + ": SegmentInfos.readCommit " + segmentFileName);
try (ChecksumIndexInput input = directory.openChecksumInput(segmentFileName, IOContext.READ)) {
- return readCommit(directory, input, generation);
+ try {
+ return readCommit(directory, input, generation);
+ } catch (EOFException e) {
+ throw new CorruptIndexException("Unexpected end of file while reading index.", input, e);
+ }
}
}