You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2018/08/01 08:13:07 UTC
[2/2] lucene-solr:branch_7x: LUCENE-8437: CheckIndex shouldn't
duplicate SegmentInfos' serialization logic.
LUCENE-8437: CheckIndex shouldn't duplicate SegmentInfos' serialization logic.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/746c9f7c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/746c9f7c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/746c9f7c
Branch: refs/heads/branch_7x
Commit: 746c9f7c2254490faebd6f5c665567b02285623e
Parents: a9f1291
Author: Adrien Grand <jp...@gmail.com>
Authored: Wed Aug 1 10:11:40 2018 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Wed Aug 1 10:12:53 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 ++
.../org/apache/lucene/index/CheckIndex.java | 39 --------------------
2 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/746c9f7c/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 1a2e1a1..03b85c8 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -42,6 +42,9 @@ API Changes:
been changed from a protected method to a java.util.function.Supplier as a
constructor argument. (Adrien Grand)
+* LUCENE-8437: CheckIndex.Status.cantOpenSegments and missingSegmentVersion
+ have been removed as they were not computed correctly. (Adrien Grand)
+
Bug Fixes:
* LUCENE-8380: UTF8TaxonomyWriterCache inconsistency. (Ruslan Torobaev, Dawid Weiss)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/746c9f7c/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
index 14ad3f7..a0f535a 100644
--- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
+++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
@@ -53,7 +53,6 @@ import org.apache.lucene.store.AlreadyClosedException;
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.Lock;
import org.apache.lucene.util.Accountables;
import org.apache.lucene.util.Bits;
@@ -106,12 +105,6 @@ public final class CheckIndex implements Closeable {
/** True if we were unable to locate and load the segments_N file. */
public boolean missingSegments;
- /** True if we were unable to open the segments_N file. */
- public boolean cantOpenSegments;
-
- /** True if we were unable to read the version number from segments_N file. */
- public boolean missingSegmentVersion;
-
/** Name of latest segments_N file in the index. */
public String segmentsFileName;
@@ -573,38 +566,6 @@ public final class CheckIndex implements Closeable {
final int numSegments = sis.size();
final String segmentsFileName = sis.getSegmentsFileName();
- // note: we only read the format byte (required preamble) here!
- IndexInput input = null;
- try {
- input = dir.openInput(segmentsFileName, IOContext.READONCE);
- } catch (Throwable t) {
- if (failFast) {
- throw IOUtils.rethrowAlways(t);
- }
- msg(infoStream, "ERROR: could not open segments file in directory");
- if (infoStream != null) {
- t.printStackTrace(infoStream);
- }
- result.cantOpenSegments = true;
- return result;
- }
- try {
- /*int format =*/ input.readInt();
- } catch (Throwable t) {
- if (failFast) {
- throw IOUtils.rethrowAlways(t);
- }
- msg(infoStream, "ERROR: could not read segment file version in directory");
- if (infoStream != null) {
- t.printStackTrace(infoStream);
- }
- result.missingSegmentVersion = true;
- return result;
- } finally {
- if (input != null)
- input.close();
- }
-
result.segmentsFileName = segmentsFileName;
result.numSegments = numSegments;
result.userData = sis.getUserData();