svn commit: r1237637 - in /lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index: IndexWriter.java SegmentInfo.java

[rm...@apache.org]

Author: rmuir
Date: Mon Jan 30 13:10:47 2012
New Revision: 1237637

URL: http://svn.apache.org/viewvc?rev=1237637&view=rev
Log:
LUCENE-3728: tidy up copySegmentAsIs/sharedDocStore logic

Modified:
    lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentInfo.java

Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1237637&r1=1237636&r2=1237637&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/IndexWriter.java Mon Jan 30 13:10:47 2012
@@ -2545,23 +2545,21 @@ public class IndexWriter implements Clos
     // only relevant for segments that share doc store with others,
     // because the DS might have been copied already, in which case we
     // just want to update the DS name of this SegmentInfo.
-    // NOTE: pre-3x segments include a null DSName if they don't share doc
-    // store. The following code ensures we don't accidentally insert
-    // 'null' to the map.
     String dsName = info.getDocStoreSegment();
+    assert dsName != null;
     final String newDsName;
-    if (dsName != null) {
-      if (dsNames.containsKey(dsName)) {
-        newDsName = dsNames.get(dsName);
-      } else {
-        dsNames.put(dsName, segName);
-        newDsName = segName;
-      }
+    if (dsNames.containsKey(dsName)) {
+      newDsName = dsNames.get(dsName);
     } else {
+      dsNames.put(dsName, segName);
       newDsName = segName;
     }
     
-    Set<String> codecDocStoreFiles = info.codecDocStoreFiles();
+    // nocommit: remove this
+    Set<String> codecDocStoreFiles = new HashSet<String>();
+    codec.storedFieldsFormat().files(info, codecDocStoreFiles);
+    codec.termVectorsFormat().files(info, codecDocStoreFiles);
+    
     // Copy the segment files
     for (String file: info.files()) {
       final String newFileName;

Modified: lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1237637&r1=1237636&r2=1237637&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/lucene3661/lucene/src/java/org/apache/lucene/index/SegmentInfo.java Mon Jan 30 13:10:47 2012
@@ -218,15 +218,6 @@ public final class SegmentInfo implement
       sizeInBytes = sum;
       return sizeInBytes;
   }
-  
-  // nocommit: wrong to call this if (compoundFile)
-  // wrong to call this at all... nuke it
-  Set<String> codecDocStoreFiles() throws IOException {
-    Set<String> docStoreFiles = new HashSet<String>();
-    codec.storedFieldsFormat().files(this, docStoreFiles);
-    codec.termVectorsFormat().files(this, docStoreFiles);
-    return docStoreFiles;
-  }
 
   public boolean getHasVectors() throws IOException {
     return hasVectors == CHECK_FIELDINFO ? getFieldInfos().hasVectors() : hasVectors == YES;