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 2014/10/20 21:48:45 UTC
svn commit: r1633212 - in /lucene/dev/branches/lucene5969/lucene: core/src/java/org/apache/lucene/codecs/lucene50/ core/src/java/org/apache/lucene/util/ test-framework/src/java/org/apache/lucene/codecs/blockterms/

Author: mikemccand
Date: Mon Oct 20 19:48:45 2014
New Revision: 1633212

URL: http://svn.apache.org/r1633212
Log:
LUCENE-5969: woops, revert

Removed:
    lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoReader.java
    lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoWriter.java
Modified:
    lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java
    lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/Version.java
    lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java
    lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java
    lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java

Modified: lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java?rev=1633212&r1=1633211&r2=1633212&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java (original)
+++ lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java Mon Oct 20 19:48:45 2014
@@ -50,7 +50,7 @@ import org.apache.lucene.util.Version;
  * <ul>
  *   <li>Header --&gt; {@link CodecUtil#writeHeader CodecHeader}</li>
  *   <li>SegSize --&gt; {@link DataOutput#writeInt Int32}</li>
- *   <li>SegVersion --&gt; {@link Version#write Version}</li>
+ *   <li>SegVersion --&gt; {@link DataOutput#writeString String}</li>
  *   <li>Files --&gt; {@link DataOutput#writeStringSet Set&lt;String&gt;}</li>
  *   <li>Diagnostics --&gt; {@link DataOutput#writeStringStringMap Map&lt;String,String&gt;}</li>
  *   <li>IsCompoundFile --&gt; {@link DataOutput#writeByte Int8}</li>
@@ -61,7 +61,7 @@ import org.apache.lucene.util.Version;
  * Field Descriptions:
  * <p>
  * <ul>
- *   <li>SegVersion is the code version that created the segment, written as 4 unsigned bytes (major, minor, bugfix, prerelease)</li>
+ *   <li>SegVersion is the code version that created the segment.</li>
  *   <li>SegSize is the number of documents contained in the segment index.</li>
  *   <li>IsCompoundFile records whether the segment is written as a compound file or
  *       not. If this is -1, the segment is not a compound file. If it is 1, the segment

Modified: lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1633212&r1=1633211&r2=1633212&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/Version.java Mon Oct 20 19:48:45 2014
@@ -18,13 +18,9 @@ package org.apache.lucene.util;
  */
 
 
-import java.io.IOException;
 import java.text.ParseException;
 import java.util.Locale;
 
-import org.apache.lucene.store.DataInput;
-import org.apache.lucene.store.DataOutput;
-
 /**
  * Use by certain classes to match version compatibility
  * across releases of Lucene.
@@ -461,25 +457,4 @@ public final class Version {
   public int hashCode() {
     return encodedValue;
   }
-
-  /**
-   * Writes the version to the provided {@link DataOutput}.
-   */
-  public void write(DataOutput out) throws IOException {
-    out.writeByte((byte) major);
-    out.writeByte((byte) minor);
-    out.writeByte((byte) bugfix);
-    out.writeByte((byte) prerelease);
-  }
-
-  /**
-   * Reads a {@code Version} previously written with {@link #writeVersion}.
-   */
-  public static Version read(DataInput in) throws IOException {
-    int major = in.readByte()&0xFF;
-    int minor = in.readByte()&0xFF;
-    int bugfix = in.readByte()&0xFF;
-    int prerelease = in.readByte()&0xFF;
-    return new Version(major, minor, bugfix, prerelease);
-  }
 }

Modified: lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java?rev=1633212&r1=1633211&r2=1633212&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java (original)
+++ lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java Mon Oct 20 19:48:45 2014
@@ -36,8 +36,8 @@ import org.apache.lucene.codecs.lucene50
 import org.apache.lucene.index.SegmentReadState;
 import org.apache.lucene.index.SegmentWriteState;
 
-// TODO: we could make separate base class that can wrap
-// any PostingsFormat and make it ord-able...
+// TODO: we could make separate base class that can wrapp
+// any PostingsBaseFormat and make it ord-able...
 
 /**
  * Customized version of {@link Lucene50PostingsFormat} that uses

Modified: lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java?rev=1633212&r1=1633211&r2=1633212&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java (original)
+++ lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java Mon Oct 20 19:48:45 2014
@@ -37,8 +37,8 @@ import org.apache.lucene.codecs.lucene50
 import org.apache.lucene.index.SegmentReadState;
 import org.apache.lucene.index.SegmentWriteState;
 
-// TODO: we could make separate base class that can wrap
-// any PostingsFormat and make it ord-able...
+// TODO: we could make separate base class that can wrapp
+// any PostingsBaseFormat and make it ord-able...
 
 /**
  * Customized version of {@link Lucene50PostingsFormat} that uses

Modified: lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java?rev=1633212&r1=1633211&r2=1633212&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java (original)
+++ lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java Mon Oct 20 19:48:45 2014
@@ -37,8 +37,8 @@ import org.apache.lucene.codecs.lucene50
 import org.apache.lucene.index.SegmentReadState;
 import org.apache.lucene.index.SegmentWriteState;
 
-// TODO: we could make separate base class that can wrap
-// any PostingsFormat and make it ord-able...
+// TODO: we could make separate base class that can wrapp
+// any PostingsBaseFormat and make it ord-able...
 
 /**
  * Customized version of {@link Lucene50PostingsFormat} that uses