svn commit: r981696 - in /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index: FieldsReader.java SegmentMerger.java TermVectorsReader.java

[mi...@apache.org]

Author: mikemccand
Date: Mon Aug  2 22:10:41 2010
New Revision: 981696

URL: http://svn.apache.org/viewvc?rev=981696&view=rev
Log:
remove dead code, take 2

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java?rev=981696&r1=981695&r2=981696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FieldsReader.java Mon Aug  2 22:10:41 2010
@@ -186,12 +186,6 @@ final class FieldsReader implements Clon
     indexStream.seek(FORMAT_SIZE + (docID + docStoreOffset) * 8L);
   }
 
-  boolean canReadRawDocs() {
-    // Since we currently only support >3.0 format anymore, always return true!
-    // I leave this method in because it may help for later format changes.
-    return true;
-  }
-
   final Document doc(int n, FieldSelector fieldSelector) throws CorruptIndexException, IOException {
     seekIndex(n);
     long position = indexStream.readLong();

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=981696&r1=981695&r2=981696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Mon Aug  2 22:10:41 2010
@@ -321,7 +321,7 @@ final class SegmentMerger {
           FieldsReader matchingFieldsReader = null;
           if (matchingSegmentReader != null) {
             final FieldsReader fieldsReader = matchingSegmentReader.getFieldsReader();
-            if (fieldsReader != null && fieldsReader.canReadRawDocs()) {            
+            if (fieldsReader != null) {
               matchingFieldsReader = fieldsReader;
             }
           }

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java?rev=981696&r1=981695&r2=981696&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/TermVectorsReader.java Mon Aug  2 22:10:41 2010
@@ -104,8 +104,12 @@ class TermVectorsReader implements Clone
           // docs
           assert numTotalDocs >= size + docStoreOffset: "numTotalDocs=" + numTotalDocs + " size=" + size + " docStoreOffset=" + docStoreOffset;
         }
-      } else
+      } else {
+        // TODO: understand why FieldInfos.hasVectors() can
+        // return true yet the term vectors files don't
+        // exist...
         format = 0;
+      }
 
       this.fieldInfos = fieldInfos;
       success = true;
@@ -136,7 +140,9 @@ class TermVectorsReader implements Clone
   }
 
   boolean canReadRawDocs() {
-    return format >= FORMAT_UTF8_LENGTH_IN_BYTES;
+    // we can always read raw docs, unless the term vectors
+    // didn't exist
+    return format != 0;
   }
 
   /** Retrieve the length (in bytes) of the tvd and tvf
@@ -153,11 +159,6 @@ class TermVectorsReader implements Clone
       return;
     }
 
-    // SegmentMerger calls canReadRawDocs() first and should
-    // not call us if that returns false.
-    if (format < FORMAT_UTF8_LENGTH_IN_BYTES)
-      throw new IllegalStateException("cannot read raw docs with older term vector formats");
-
     seekTvx(startDocID);
 
     long tvdPosition = tvx.readLong();