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 2012/05/17 19:34:51 UTC

svn commit: r1339732 - in /lucene/dev/branches/lucene4055/lucene: core/src/java/org/apache/lucene/codecs/lucene3x/ core/src/java/org/apache/lucene/codecs/lucene40/ core/src/java/org/apache/lucene/codecs/sep/ core/src/java/org/apache/lucene/codecs/simpl...

Author: mikemccand
Date: Thu May 17 17:34:49 2012
New Revision: 1339732

URL: http://svn.apache.org/viewvc?rev=1339732&view=rev
Log:
LUCENE-4055: remove extra booleans

Modified:
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesConsumer.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosReader.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosWriter.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
    lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
    lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
    lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
    lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
    lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java
    lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xSegmentInfosReader.java Thu May 17 17:34:49 2012
@@ -163,9 +163,8 @@ class Lucene3xSegmentInfosReader extends
       }
     }
 
-    // nocommit 3x always has norms?
     return new SegmentInfo(dir, version, name, docCount, delGen, docStoreOffset,
       docStoreSegment, docStoreIsCompoundFile, normGen, isCompoundFile,
-      delCount, hasProx, codec, diagnostics, hasVectors, false, true, true);
+      delCount, hasProx, codec, diagnostics, hasVectors);
   }
 }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesConsumer.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesConsumer.java Thu May 17 17:34:49 2012
@@ -67,19 +67,16 @@ public class Lucene40DocValuesConsumer e
   }
 
   public static void files(SegmentInfo segmentInfo, Set<String> files) throws IOException {
-    if (segmentInfo.getHasDocValues()) {
-      files.add(IndexFileNames.segmentFileName(segmentInfo.name, DOC_VALUES_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_EXTENSION));
-      files.add(IndexFileNames.segmentFileName(segmentInfo.name, DOC_VALUES_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION));
-      assert segmentInfo.dir.fileExists(IndexFileNames.segmentFileName(segmentInfo.name, DOC_VALUES_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION)); 
-      assert segmentInfo.dir.fileExists(IndexFileNames.segmentFileName(segmentInfo.name, DOC_VALUES_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_EXTENSION)); 
-    }
+    files.add(IndexFileNames.segmentFileName(segmentInfo.name, DOC_VALUES_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_EXTENSION));
+    files.add(IndexFileNames.segmentFileName(segmentInfo.name, DOC_VALUES_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION));
   }
 
   @Override
   public void abort() {
     try {
       close();
-    } catch (IOException ignored) {}
+    } catch (IOException ignored) {
+    }
     IOUtils.deleteFilesIgnoringExceptions(mainDirectory, IndexFileNames.segmentFileName(
         segmentName, segmentSuffix, IndexFileNames.COMPOUND_FILE_EXTENSION),
         IndexFileNames.segmentFileName(segmentName, segmentSuffix,

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsFormat.java Thu May 17 17:34:49 2012
@@ -123,12 +123,10 @@ public class Lucene40NormsFormat extends
     }
     
     public static void files(SegmentInfo segmentInfo, Set<String> files) throws IOException {
-      if (segmentInfo.getHasNorms()) {
-        final String normsFileName = IndexFileNames.segmentFileName(segmentInfo.name, NORMS_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_EXTENSION);
-        final String normsEntriesFileName = IndexFileNames.segmentFileName(segmentInfo.name, NORMS_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION);
-        files.add(normsFileName);
-        files.add(normsEntriesFileName);
-      }
+      final String normsFileName = IndexFileNames.segmentFileName(segmentInfo.name, NORMS_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_EXTENSION);
+      final String normsEntriesFileName = IndexFileNames.segmentFileName(segmentInfo.name, NORMS_SEGMENT_SUFFIX, IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION);
+      files.add(normsFileName);
+      files.add(normsEntriesFileName);
     }
   }
 

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosReader.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosReader.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosReader.java Thu May 17 17:34:49 2012
@@ -86,13 +86,9 @@ public class Lucene40SegmentInfosReader 
     final Codec codec = Codec.forName(input.readString());
     final Map<String,String> diagnostics = input.readStringStringMap();
     final boolean hasVectors = input.readByte() == 1;
-    final boolean hasDocValues = input.readByte() == 1;
-    final boolean hasNorms = input.readByte() == 1;
-    final boolean hasFreq = input.readByte() == 1;
     
     return new SegmentInfo(dir, version, name, docCount, delGen, docStoreOffset,
       docStoreSegment, docStoreIsCompoundFile, normGen, isCompoundFile,
-      delCount, hasProx, codec, diagnostics, hasVectors, hasDocValues, hasNorms,
-      hasFreq);
+      delCount, hasProx, codec, diagnostics, hasVectors);
   }
 }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosWriter.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosWriter.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfosWriter.java Thu May 17 17:34:49 2012
@@ -99,9 +99,6 @@ public class Lucene40SegmentInfosWriter 
     output.writeString(si.getCodec().getName());
     output.writeStringStringMap(si.getDiagnostics());
     output.writeByte((byte) (si.getHasVectors() ? 1 : 0));
-    output.writeByte((byte) (si.getHasDocValues() ? 1 : 0));
-    output.writeByte((byte) (si.getHasNorms() ? 1 : 0));
-    output.writeByte((byte) (si.getHasFreq() ? 1 : 0));
   }
   
   protected IndexOutput createOutput(Directory dir, String segmentFileName, IOContext context)

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java Thu May 17 17:34:49 2012
@@ -66,7 +66,6 @@ public class SepDocValuesConsumer extend
   @Override
   public void abort() {
     Set<String> files = new HashSet<String>();
-    assert false: "sep is broken for now!!";
     files(segmentName, files);
     IOUtils.deleteFilesIgnoringExceptions(directory, SegmentInfo.findMatchingFiles(directory, files).toArray(new String[0]));
   }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java Thu May 17 17:34:49 2012
@@ -24,8 +24,9 @@ import org.apache.lucene.codecs.BlockTer
 import org.apache.lucene.codecs.PostingsReaderBase;
 import org.apache.lucene.index.DocsAndPositionsEnum;
 import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo;
 import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
 import org.apache.lucene.index.IndexFileNames;
 import org.apache.lucene.index.SegmentInfo;
 import org.apache.lucene.index.TermState;
@@ -60,7 +61,7 @@ public class SepPostingsReader extends P
   int maxSkipLevels;
   int skipMinimum;
 
-  public SepPostingsReader(Directory dir, SegmentInfo segmentInfo, IOContext context, IntStreamFactory intFactory, String segmentSuffix) throws IOException {
+  public SepPostingsReader(Directory dir, FieldInfos fieldInfos, SegmentInfo segmentInfo, IOContext context, IntStreamFactory intFactory, String segmentSuffix) throws IOException {
     boolean success = false;
     try {
 
@@ -69,7 +70,7 @@ public class SepPostingsReader extends P
 
       skipIn = dir.openInput(IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.SKIP_EXTENSION), context);
 
-      if (segmentInfo.getHasFreq()) {
+      if (fieldInfos.hasFreq()) {
         freqIn = intFactory.openInput(dir, IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.FREQ_EXTENSION), context);        
       } else {
         freqIn = null;
@@ -93,9 +94,7 @@ public class SepPostingsReader extends P
     files.add(IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.DOC_EXTENSION));
     files.add(IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.SKIP_EXTENSION));
 
-    if (segmentInfo.getHasFreq()) {
-      files.add(IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.FREQ_EXTENSION));
-    }
+    files.add(IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.FREQ_EXTENSION));
 
     if (segmentInfo.getHasProx()) {
       files.add(IndexFileNames.segmentFileName(segmentInfo.name, segmentSuffix, SepPostingsWriter.POS_EXTENSION));

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Thu May 17 17:34:49 2012
@@ -129,24 +129,22 @@ public class SimpleTextNormsFormat exten
     @Override
     public void abort() {
       Set<String> files = new HashSet<String>();
-      filesInternal(state.fieldInfos.hasNorms(), state.segmentName, files, segmentSuffix);
+      filesInternal(state.segmentName, files, segmentSuffix);
       IOUtils.deleteFilesIgnoringExceptions(state.directory,
                                             SegmentInfo.findMatchingFiles(state.directory, files).toArray(new String[0]));
     }
     
     public static void files(SegmentInfo segmentInfo, Set<String> files)
         throws IOException {
-      filesInternal(segmentInfo.getHasNorms(), segmentInfo.name, files,
+      filesInternal(segmentInfo.name, files,
           NORMS_SEG_SUFFIX);
     }
     
-    public static void filesInternal(boolean hasNorms, String segmentName,
+    public static void filesInternal(String segmentName,
         Set<String> files, String segmentSuffix) {
-      if (hasNorms) {
-        String id = docValuesIdRegexp(segmentName);
-        files.add(IndexFileNames.segmentFileName(id, "",
-                                                 segmentSuffix));
-      }
+      String id = docValuesIdRegexp(segmentName);
+      files.add(IndexFileNames.segmentFileName(id, "",
+                                               segmentSuffix));
     }
   }
 }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosReader.java Thu May 17 17:34:49 2012
@@ -111,18 +111,6 @@ public class SimpleTextSegmentInfosReade
     final boolean hasVectors = Boolean.parseBoolean(readString(SI_HASVECTORS.length, scratch));
 
     SimpleTextUtil.readLine(input, scratch);
-    assert StringHelper.startsWith(scratch, SI_HASDOCVALUES);
-    final boolean hasDocValues = Boolean.parseBoolean(readString(SI_HASDOCVALUES.length, scratch));
-    
-    SimpleTextUtil.readLine(input, scratch);
-    assert StringHelper.startsWith(scratch, SI_HASNORMS);
-    final boolean hasNorms = Boolean.parseBoolean(readString(SI_HASNORMS.length, scratch));
-
-    SimpleTextUtil.readLine(input, scratch);
-    assert StringHelper.startsWith(scratch, SI_HASFREQS);
-    final boolean hasFreqs = Boolean.parseBoolean(readString(SI_HASFREQS.length, scratch));
-    
-    SimpleTextUtil.readLine(input, scratch);
     assert StringHelper.startsWith(scratch, SI_USECOMPOUND);
     final boolean isCompoundFile = Boolean.parseBoolean(readString(SI_USECOMPOUND.length, scratch));
     
@@ -180,7 +168,7 @@ public class SimpleTextSegmentInfosReade
     
     return new SegmentInfo(directory, version, name, docCount, delGen, dsOffset,
         dsSegment, dsCompoundFile, normGen, isCompoundFile,
-        delCount, hasProx, codec, diagnostics, hasVectors, hasDocValues, hasNorms, hasFreqs);
+        delCount, hasProx, codec, diagnostics, hasVectors);
   }
   
   private String readString(int offset, BytesRef scratch) {

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfosWriter.java Thu May 17 17:34:49 2012
@@ -53,9 +53,6 @@ public class SimpleTextSegmentInfosWrite
   final static BytesRef SI_DELCOUNT         = new BytesRef("    number of deletions ");
   final static BytesRef SI_HASPROX          = new BytesRef("    has prox ");
   final static BytesRef SI_HASVECTORS       = new BytesRef("    has vectors ");
-  final static BytesRef SI_HASDOCVALUES     = new BytesRef("    has doc values ");
-  final static BytesRef SI_HASNORMS         = new BytesRef("    has norms ");
-  final static BytesRef SI_HASFREQS         = new BytesRef("    has freqs ");
   final static BytesRef SI_USECOMPOUND      = new BytesRef("    uses compound file ");
   final static BytesRef SI_DSOFFSET         = new BytesRef("    docstore offset ");
   final static BytesRef SI_DSSEGMENT        = new BytesRef("    docstore segment ");
@@ -157,18 +154,6 @@ public class SimpleTextSegmentInfosWrite
     SimpleTextUtil.write(output, si.getHasVectors() ? "true" : "false", scratch);
     SimpleTextUtil.writeNewline(output);
 
-    SimpleTextUtil.write(output, SI_HASDOCVALUES);
-    SimpleTextUtil.write(output, si.getHasDocValues() ? "true" : "false", scratch);
-    SimpleTextUtil.writeNewline(output);
-    
-    SimpleTextUtil.write(output, SI_HASNORMS);
-    SimpleTextUtil.write(output, si.getHasNorms() ? "true" : "false", scratch);
-    SimpleTextUtil.writeNewline(output);
-
-    SimpleTextUtil.write(output, SI_HASFREQS);
-    SimpleTextUtil.write(output, si.getHasFreq() ? "true" : "false", scratch);
-    SimpleTextUtil.writeNewline(output);
-    
     SimpleTextUtil.write(output, SI_USECOMPOUND);
     SimpleTextUtil.write(output, Boolean.toString(si.getUseCompoundFile()), scratch);
     SimpleTextUtil.writeNewline(output);

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Thu May 17 17:34:49 2012
@@ -479,18 +479,15 @@ class DocumentsWriterPerThread {
                                                      SegmentInfo.NO, -1, segment, false, null, false, 0,
                                                      flushState.fieldInfos.hasProx(), flushState.codec,
                                                      null,
-                                                     flushState.fieldInfos.hasVectors(),
-                                                     flushState.fieldInfos.hasDocValues(),
-                                                     flushState.fieldInfos.hasNorms(),
-                                                     flushState.fieldInfos.hasFreq());
+                                                     flushState.fieldInfos.hasVectors());
       if (infoStream.isEnabled("DWPT")) {
         infoStream.message("DWPT", "new segment has " + (flushState.liveDocs == null ? 0 : (flushState.numDocs - flushState.delCountOnFlush)) + " deleted docs");
         infoStream.message("DWPT", "new segment has " +
-                           (newSegment.getHasVectors() ? "vectors" : "no vectors") + "; " +
-                           (newSegment.getHasNorms() ? "norms" : "no norms") + "; " + 
-                           (newSegment.getHasDocValues() ? "docValues" : "no docValues") + "; " + 
-                           (newSegment.getHasProx() ? "prox" : "no prox") + "; " + 
-                           (newSegment.getHasProx() ? "freqs" : "no freqs"));
+                           (flushState.fieldInfos.hasVectors() ? "vectors" : "no vectors") + "; " +
+                           (flushState.fieldInfos.hasNorms() ? "norms" : "no norms") + "; " + 
+                           (flushState.fieldInfos.hasDocValues() ? "docValues" : "no docValues") + "; " + 
+                           (flushState.fieldInfos.hasProx() ? "prox" : "no prox") + "; " + 
+                           (flushState.fieldInfos.hasFreq() ? "freqs" : "no freqs"));
         infoStream.message("DWPT", "flushedFiles=" + newSegment.files());
         infoStream.message("DWPT", "flushed codec=" + newSegment.getCodec());
       }

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu May 17 17:34:49 2012
@@ -2291,10 +2291,7 @@ public class IndexWriter implements Clos
       SegmentInfo info = new SegmentInfo(directory, Constants.LUCENE_MAIN_VERSION, mergedName, docCount,
                                          SegmentInfo.NO, -1, mergedName, false, null, false, 0,
                                          mergeState.fieldInfos.hasProx(), codec, null,
-                                         mergeState.fieldInfos.hasVectors(),
-                                         mergeState.fieldInfos.hasDocValues(),
-                                         mergeState.fieldInfos.hasNorms(),
-                                         mergeState.fieldInfos.hasFreq());
+                                         mergeState.fieldInfos.hasVectors());
                                          
       setDiagnostics(info, "addIndexes(IndexReader...)");
 
@@ -3441,9 +3438,6 @@ public class IndexWriter implements Clos
       // LUCENE-3403: set hasVectors after merge(), so that it is properly set.
       merge.info.setHasVectors(mergeState.fieldInfos.hasVectors());
       merge.info.setHasProx(mergeState.fieldInfos.hasProx());
-      merge.info.setHasFreq(mergeState.fieldInfos.hasFreq());
-      merge.info.setHasDocValues(mergeState.fieldInfos.hasDocValues());
-      merge.info.setHasNorms(mergeState.fieldInfos.hasNorms());
 
       // Record which codec was used to write the segment
 
@@ -3453,11 +3447,11 @@ public class IndexWriter implements Clos
 
       if (infoStream.isEnabled("IW")) {
         infoStream.message("IW", "merge codec=" + codec + " docCount=" + mergedDocCount + "; merged segment has " +
-                           (merge.info.getHasVectors() ? "vectors" : "no vectors") + "; " +
-                           (merge.info.getHasNorms() ? "norms" : "no norms") + "; " + 
-                           (merge.info.getHasDocValues() ? "docValues" : "no docValues") + "; " + 
-                           (merge.info.getHasProx() ? "prox" : "no prox") + "; " + 
-                           (merge.info.getHasProx() ? "freqs" : "no freqs"));
+                           (mergeState.fieldInfos.hasVectors() ? "vectors" : "no vectors") + "; " +
+                           (mergeState.fieldInfos.hasNorms() ? "norms" : "no norms") + "; " + 
+                           (mergeState.fieldInfos.hasDocValues() ? "docValues" : "no docValues") + "; " + 
+                           (mergeState.fieldInfos.hasProx() ? "prox" : "no prox") + "; " + 
+                           (mergeState.fieldInfos.hasProx() ? "freqs" : "no freqs"));
       }
 
       // Very important to do this before opening the reader

Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Thu May 17 17:34:49 2012
@@ -71,10 +71,6 @@ public final class SegmentInfo implement
 
   private boolean isCompoundFile;
 
-  // nocommit should we stop caching the files!?
-  private volatile List<String> files;            // cached list of files that this segment uses
-                                                  // in the Directory
-
   private volatile long sizeInBytes = -1;         // total byte size of all files (computed on demand)
 
   //TODO: LUCENE-2555: remove once we don't need to support shared doc stores (pre 4.0)
@@ -89,10 +85,7 @@ public final class SegmentInfo implement
   private int delCount;                           // How many deleted docs in this segment
   
   private boolean hasVectors;       // True if this segment has any term vectors fields
-  private boolean hasDocValues;     // True if this segment has any doc values fields
-  private boolean hasFreq;          // True if this segment has any fields with docFreq information
   private boolean hasProx;          // True if this segment has any fields with positional information
-  private boolean hasNorms;         // True if this segment has any fields with norms enabled
 
   private Codec codec;
 
@@ -139,8 +132,7 @@ public final class SegmentInfo implement
    */
   public SegmentInfo(Directory dir, String version, String name, int docCount, long delGen, int docStoreOffset,
       String docStoreSegment, boolean docStoreIsCompoundFile, Map<Integer,Long> normGen, boolean isCompoundFile,
-      int delCount, boolean hasProx, Codec codec, Map<String,String> diagnostics, boolean hasVectors, boolean hasDocValues,
-      boolean hasNorms, boolean hasFreq) {
+      int delCount, boolean hasProx, Codec codec, Map<String,String> diagnostics, boolean hasVectors) {
     this.dir = dir;
     this.version = version;
     this.name = name;
@@ -157,34 +149,23 @@ public final class SegmentInfo implement
     this.diagnostics = diagnostics;
     // nocommit remove these now that we can do regexp instead!
     this.hasVectors = hasVectors;
-    this.hasDocValues = hasDocValues;
-    this.hasNorms = hasNorms;
-    this.hasFreq = hasFreq;
   }
 
   /**
    * Returns total size in bytes of all of files used by this segment
    */
   public long sizeInBytes() throws IOException {
-    long sum = 0;
-    for (final String fileName : files()) {
-      sum += dir.fileLength(fileName);
+    if (sizeInBytes == -1) {
+      long sum = 0;
+      for (final String fileName : files()) {
+        sum += dir.fileLength(fileName);
+      }
+      sizeInBytes = sum;
     }
-    sizeInBytes = sum;
     return sizeInBytes;
   }
 
   // nocommit: ideally codec stores this info privately:
-  public boolean getHasFreq() throws IOException {
-    return hasFreq;
-  }
-
-  public void setHasFreq(boolean hasFreq) {
-    this.hasFreq = hasFreq;
-    clearFilesCache();
-  }
-
-  // nocommit: ideally codec stores this info privately:
   public boolean getHasProx() throws IOException {
     return hasProx;
   }
@@ -204,26 +185,6 @@ public final class SegmentInfo implement
     clearFilesCache();
   }
 
-  // nocommit: ideally codec stores this info privately:
-  public boolean getHasDocValues() throws IOException {
-    return hasDocValues;
-  }
-
-  public void setHasDocValues(boolean hasDocValues) {
-    this.hasDocValues = hasDocValues;
-    clearFilesCache();
-  }
-  
-  // nocommit: ideally codec stores this info privately:
-  public boolean getHasNorms() throws IOException {
-    return hasNorms;
-  }
-
-  public void setHasNorms(boolean hasNorms) {
-    this.hasNorms = hasNorms;
-    clearFilesCache();
-  }
-  
   public boolean hasDeletions() {
     // Cases:
     //
@@ -270,7 +231,7 @@ public final class SegmentInfo implement
     return new SegmentInfo(dir, version, name, docCount, delGen, docStoreOffset,
                            docStoreSegment, docStoreIsCompoundFile, clonedNormGen, isCompoundFile,
                            delCount, hasProx, codec, new HashMap<String,String>(diagnostics),
-                           hasVectors, hasDocValues, hasNorms, hasFreq);
+                           hasVectors);
   }
 
   /**
@@ -411,21 +372,14 @@ public final class SegmentInfo implement
    */
 
   public List<String> files() throws IOException {
-    if (files == null) {
-      // nocommit maybe don't cache...?
-      // Cache
-      final Set<String> fileSet = new HashSet<String>();
-      codec.files(this, fileSet);
-      files = findMatchingFiles(dir, fileSet);
-    }
-
-    return files;
+    final Set<String> fileSet = new HashSet<String>();
+    codec.files(this, fileSet);
+    return findMatchingFiles(dir, fileSet);
   }
 
   /* Called whenever any change is made that affects which
    * files this segment has. */
   private void clearFilesCache() {
-    files = null;
     sizeInBytes = -1;
   }
 

Modified: lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Thu May 17 17:34:49 2012
@@ -314,10 +314,7 @@ public class TestCodecs extends LuceneTe
     final SegmentInfo si = new SegmentInfo(dir, Constants.LUCENE_MAIN_VERSION, SEGMENT, 10000, -1, -1,
                                            SEGMENT, false, null, false, 0,
                                            fieldInfos.hasProx(),
-                                           codec, null, fieldInfos.hasVectors(),
-                                           fieldInfos.hasDocValues(),
-                                           fieldInfos.hasNorms(),
-                                           fieldInfos.hasFreq());
+                                           codec, null, fieldInfos.hasVectors());
 
     if (VERBOSE) {
       System.out.println("TEST: now read postings");

Modified: lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestDoc.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestDoc.java Thu May 17 17:34:49 2012
@@ -203,10 +203,7 @@ public class TestDoc extends LuceneTestC
       final SegmentInfo info = new SegmentInfo(si1.dir, Constants.LUCENE_MAIN_VERSION, merged,
                                                si1.docCount + si2.docCount, -1, -1, merged,
                                                false, null, false, 0, mergeState.fieldInfos.hasProx(), codec, null,
-                                               mergeState.fieldInfos.hasVectors(),
-                                               mergeState.fieldInfos.hasDocValues(),
-                                               mergeState.fieldInfos.hasNorms(),
-                                               mergeState.fieldInfos.hasFreq());
+                                               mergeState.fieldInfos.hasVectors());
       
       if (useCompoundFile) {
         Collection<String> filesToDelete = IndexWriter.createCompoundFile(dir, merged + ".cfs", MergeState.CheckAbort.NONE, info, newIOContext(random()));

Modified: lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Thu May 17 17:34:49 2012
@@ -86,10 +86,7 @@ public class TestSegmentMerger extends L
     //Should be able to open a new SegmentReader against the new directory
     SegmentReader mergedReader = new SegmentReader(new SegmentInfo(mergedDir, Constants.LUCENE_MAIN_VERSION, mergedSegment, docsMerged, -1, -1, mergedSegment,
                                                                    false, null, false, 0, mergeState.fieldInfos.hasProx(), codec, null,
-                                                                   mergeState.fieldInfos.hasVectors(),
-                                                                   mergeState.fieldInfos.hasDocValues(),
-                                                                   mergeState.fieldInfos.hasNorms(),
-                                                                   mergeState.fieldInfos.hasFreq()),
+                                                                   mergeState.fieldInfos.hasVectors()),
                                                    DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random()));
     assertTrue(mergedReader != null);
     assertTrue(mergedReader.numDocs() == 2);

Modified: lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java Thu May 17 17:34:49 2012
@@ -156,6 +156,7 @@ public class MockFixedIntBlockPostingsFo
   @Override
   public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
     PostingsReaderBase postingsReader = new SepPostingsReader(state.dir,
+                                                              state.fieldInfos,
                                                               state.segmentInfo,
                                                               state.context,
                                                               new MockIntFactory(blockSize), state.segmentSuffix);

Modified: lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java Thu May 17 17:34:49 2012
@@ -179,6 +179,7 @@ public class MockVariableIntBlockPosting
   @Override
   public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
     PostingsReaderBase postingsReader = new SepPostingsReader(state.dir,
+                                                              state.fieldInfos,
                                                               state.segmentInfo,
                                                               state.context,
                                                               new MockIntFactory(baseBlockSize), state.segmentSuffix);

Modified: lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java Thu May 17 17:34:49 2012
@@ -293,7 +293,7 @@ public class MockRandomPostingsFormat ex
       if (LuceneTestCase.VERBOSE) {
         System.out.println("MockRandomCodec: reading Sep postings");
       }
-      postingsReader = new SepPostingsReader(state.dir, state.segmentInfo,
+      postingsReader = new SepPostingsReader(state.dir, state.fieldInfos, state.segmentInfo,
                                              state.context, new MockIntStreamFactory(random), state.segmentSuffix);
     } else {
       if (LuceneTestCase.VERBOSE) {

Modified: lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java?rev=1339732&r1=1339731&r2=1339732&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java (original)
+++ lucene/dev/branches/lucene4055/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSepPostingsFormat.java Thu May 17 17:34:49 2012
@@ -85,7 +85,7 @@ public class MockSepPostingsFormat exten
   @Override
   public FieldsProducer fieldsProducer(SegmentReadState state) throws IOException {
 
-    PostingsReaderBase postingsReader = new SepPostingsReader(state.dir, state.segmentInfo,
+    PostingsReaderBase postingsReader = new SepPostingsReader(state.dir, state.fieldInfos, state.segmentInfo,
         state.context, new MockSingleIntFactory(), state.segmentSuffix);
 
     TermsIndexReaderBase indexReader;