You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/06/22 10:10:40 UTC
svn commit: r1138330 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/ lucene/backwards/src/test-framework/
lucene/backwards/src/test/ lucene/src/java/org/apache/lucene/index/ solr/
Author: rmuir
Date: Wed Jun 22 08:10:40 2011
New Revision: 1138330
URL: http://svn.apache.org/viewvc?rev=1138330&view=rev
Log:
LUCENE-3226: revert
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1138330&r1=1138329&r2=1138330&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/CheckIndex.java Wed Jun 22 08:10:40 2011
@@ -381,8 +381,8 @@ public class CheckIndex {
sFormat = "FORMAT_DIAGNOSTICS [Lucene 2.9]";
else if (format == SegmentInfos.FORMAT_HAS_VECTORS)
sFormat = "FORMAT_HAS_VECTORS [Lucene 3.1]";
- else if (format == SegmentInfos.FORMAT_SEGMENT_RECORDS_VERSION)
- sFormat = "FORMAT_SEGMENT_RECORDS_VERSION [Lucene 3.1+]";
+ else if (format == SegmentInfos.FORMAT_3_1)
+ sFormat = "FORMAT_3_1 [Lucene 3.1]";
else if (format == SegmentInfos.CURRENT_FORMAT)
throw new RuntimeException("BUG: You should update this tool!");
else if (format < SegmentInfos.CURRENT_FORMAT) {
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1138330&r1=1138329&r2=1138330&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfo.java Wed Jun 22 08:10:40 2011
@@ -167,7 +167,7 @@ public final class SegmentInfo implement
*/
SegmentInfo(Directory dir, int format, IndexInput input) throws IOException {
this.dir = dir;
- if (format <= SegmentInfos.FORMAT_SEGMENT_RECORDS_VERSION) {
+ if (format <= SegmentInfos.FORMAT_3_1) {
version = input.readString();
}
name = input.readString();
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1138330&r1=1138329&r2=1138330&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/SegmentInfos.java Wed Jun 22 08:10:40 2011
@@ -97,14 +97,10 @@ public final class SegmentInfos implemen
public static final int FORMAT_HAS_VECTORS = -10;
/** Each segment records the Lucene version that created it. */
- public static final int FORMAT_SEGMENT_RECORDS_VERSION = -11;
-
- /** @deprecated use FORMAT_SEGMENT_RECORDS_VERSION instead. */
- @Deprecated
- public static final int FORMAT_3_1 = FORMAT_SEGMENT_RECORDS_VERSION;
+ public static final int FORMAT_3_1 = -11;
/* This must always point to the most recent file format. */
- public static final int CURRENT_FORMAT = FORMAT_SEGMENT_RECORDS_VERSION;
+ public static final int CURRENT_FORMAT = FORMAT_3_1;
public int counter = 0; // used to name new segments
/**