Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-4055: clean up some nocommits 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1341688 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-05-23 00:28:05 +00:00
parent 10eac8949f
commit 8824011aff
8 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lucene/core/src/java/org/apache/lucene/codecs/sep/SepDocValuesConsumer.java
View File

@ -51,7 +51,7 @@ public class SepDocValuesConsumer extends DocValuesWriterBase {
@Override @Override
public void abort() { public void abort() {
// nocommit must we really delete the files...? IFD // We don't have to remove files here: IndexFileDeleter
// will do so I think? // will do so
} }
} }

4
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
View File

@ -123,8 +123,8 @@ public class SimpleTextNormsFormat extends NormsFormat {
@Override @Override
public void abort() { public void abort() {
// nocommit must we really delete the files...? IFD // We don't have to remove files here: IndexFileDeleter
// will do so I think? // will do so
} }
} }
} }

4
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java
View File

@ -57,8 +57,8 @@ class SimpleTextPerDocConsumer extends PerDocConsumer {
@Override @Override
public void abort() { public void abort() {
// nocommit must we really delete the files...? IFD // We don't have to remove files here: IndexFileDeleter
// will do so I think? // will do so
} }
static String docValuesId(String segmentsName, int fieldId) { static String docValuesId(String segmentsName, int fieldId) {

2
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
View File

@ -25,8 +25,6 @@ import org.apache.lucene.codecs.SegmentInfoWriter;
import org.apache.lucene.index.IndexFileNames; import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo; import org.apache.lucene.index.SegmentInfo;
// nocommit rename (remove s)
/** /**
* plain text segments file format. * plain text segments file format.
* <p> * <p>

2
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
View File

@ -40,8 +40,6 @@ import org.apache.lucene.util.StringHelper;
import static org.apache.lucene.codecs.simpletext.SimpleTextSegmentInfoWriter.*; import static org.apache.lucene.codecs.simpletext.SimpleTextSegmentInfoWriter.*;
// nocommit rename (remove s)
/** /**
* reads plaintext segments files * reads plaintext segments files
* <p> * <p>

2
lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java
View File

@ -35,8 +35,6 @@ import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
// nocommit rename (remove s)
/** /**
* writes plaintext segments files * writes plaintext segments files
* <p> * <p>

1
lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
View File

@ -485,6 +485,7 @@ class DocumentsWriterPerThread {
try { try {
consumer.flush(flushState); consumer.flush(flushState);
pendingDeletes.terms.clear(); pendingDeletes.terms.clear();
// nocommit use setter and make this a SetOnce:
segmentInfo.docCount = flushState.numDocs; segmentInfo.docCount = flushState.numDocs;
segmentInfo.setFiles(new HashSet<String>(directory.getCreatedFiles())); segmentInfo.setFiles(new HashSet<String>(directory.getCreatedFiles()));

3
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
View File

@ -2302,6 +2302,8 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
} }
MergeState mergeState = merger.merge(); // merge 'em MergeState mergeState = merger.merge(); // merge 'em
// nocommit use setter and make this a SetOnce:
info.docCount = mergeState.mergedDocCount; info.docCount = mergeState.mergedDocCount;
SegmentInfoPerCommit infoPerCommit = new SegmentInfoPerCommit(info, 0, -1L); SegmentInfoPerCommit infoPerCommit = new SegmentInfoPerCommit(info, 0, -1L);
@ -3499,6 +3501,7 @@ public class IndexWriter implements Closeable, TwoPhaseCommit {
// This is where all the work happens: // This is where all the work happens:
MergeState mergeState = merger.merge(); MergeState mergeState = merger.merge();
// nocommit use setter and make this a SetOnce:
merge.info.info.docCount = mergeState.mergedDocCount; merge.info.info.docCount = mergeState.mergedDocCount;
merge.info.info.setFiles(new HashSet<String>(dirWrapper.getCreatedFiles())); merge.info.info.setFiles(new HashSet<String>(dirWrapper.getCreatedFiles()));