svn commit: r1210309 - /lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java

[rm...@apache.org]

Author: rmuir
Date: Mon Dec  5 02:06:56 2011
New Revision: 1210309

URL: http://svn.apache.org/viewvc?rev=1210309&view=rev
Log:
LUCENE-3606: remove more SegmentReader cruft

Modified:
    lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java

Modified: lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1210309&r1=1210308&r2=1210309&view=diff
==============================================================================
--- lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/SegmentReader.java Mon Dec  5 02:06:56 2011
@@ -145,7 +145,7 @@ public class SegmentReader extends Index
 
   private void loadLiveDocs(IOContext context) throws IOException {
     // NOTE: the bitvector is stored using the regular directory, not cfs
-    if (hasDeletions(si)) {
+    if (si.hasDeletions()) {
       liveDocs = new BitVector(directory(), si.getDelFileName(), new IOContext(context, true));
       liveDocsRef = new AtomicInteger(1);
       assert checkLiveCounts();
@@ -157,17 +157,6 @@ public class SegmentReader extends Index
   }
   
   /**
-   * Clones the norm bytes.  May be overridden by subclasses.  New and experimental.
-   * @param bytes Byte array to clone
-   * @return New BitVector
-   */
-  protected byte[] cloneNormBytes(byte[] bytes) {
-    byte[] cloneBytes = new byte[bytes.length];
-    System.arraycopy(bytes, 0, cloneBytes, 0, bytes.length);
-    return cloneBytes;
-  }
-  
-  /**
    * Clones the deleteDocs BitVector.  May be overridden by subclasses. New and experimental.
    * @param bv BitVector to clone
    * @return New BitVector
@@ -352,25 +341,12 @@ public class SegmentReader extends Index
     }
   }
 
-  static boolean hasDeletions(SegmentInfo si) throws IOException {
-    // Don't call ensureOpen() here (it could affect performance)
-    return si.hasDeletions();
-  }
-
   @Override
   public boolean hasDeletions() {
     // Don't call ensureOpen() here (it could affect performance)
     return liveDocs != null;
   }
 
-  static boolean usesCompoundFile(SegmentInfo si) throws IOException {
-    return si.getUseCompoundFile();
-  }
-
-  static boolean hasSeparateNorms(SegmentInfo si) throws IOException {
-    return si.hasSeparateNorms();
-  }
-
   // nocommit: remove deletions from SR
   synchronized void deleteDocument(int docNum) throws IOException {
     ensureOpen();