You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/05/23 22:06:55 UTC
svn commit: r1342009 - in /lucene/dev/branches/lucene4055/lucene/core/src:
java/org/apache/lucene/codecs/ java/org/apache/lucene/codecs/lucene40/values/
java/org/apache/lucene/index/ test/org/apache/lucene/index/
Author: rmuir
Date: Wed May 23 20:06:55 2012
New Revision: 1342009
URL: http://svn.apache.org/viewvc?rev=1342009&view=rev
Log:
LUCENE-4055: remove redundant mergedDocCount
Modified:
lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java
lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java
lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java
lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/MergeState.java
lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/lucene4055/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java?rev=1342009&r1=1342008&r2=1342009&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java Wed May 23 20:06:55 2012
@@ -103,7 +103,7 @@ public abstract class DocValuesConsumer
}
// only finish if no exception is thrown!
if (hasMerged) {
- finish(mergeState.mergedDocCount);
+ finish(mergeState.segmentInfo.getDocCount());
}
}
Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java?rev=1342009&r1=1342008&r2=1342009&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java Wed May 23 20:06:55 2012
@@ -79,7 +79,7 @@ public abstract class TermsConsumer {
long sumTotalTermFreq = 0;
long sumDocFreq = 0;
long sumDFsinceLastAbortCheck = 0;
- FixedBitSet visitedDocs = new FixedBitSet(mergeState.mergedDocCount);
+ FixedBitSet visitedDocs = new FixedBitSet(mergeState.segmentInfo.getDocCount());
IndexOptions indexOptions = mergeState.fieldInfo.getIndexOptions();
if (indexOptions == IndexOptions.DOCS_ONLY) {
Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java?rev=1342009&r1=1342008&r2=1342009&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/FixedSortedBytesImpl.java Wed May 23 20:06:55 2012
@@ -68,7 +68,7 @@ class FixedSortedBytesImpl {
throws IOException {
boolean success = false;
try {
- final MergeContext ctx = SortedBytesMergeUtils.init(Type.BYTES_FIXED_SORTED, docValues, comp, mergeState.mergedDocCount);
+ final MergeContext ctx = SortedBytesMergeUtils.init(Type.BYTES_FIXED_SORTED, docValues, comp, mergeState.segmentInfo.getDocCount());
List<SortedSourceSlice> slices = SortedBytesMergeUtils.buildSlices(mergeState.docBase, mergeState.docMaps, docValues, ctx);
final IndexOutput datOut = getOrCreateDataOut();
datOut.writeInt(ctx.sizePerValues);
Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java?rev=1342009&r1=1342008&r2=1342009&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java Wed May 23 20:06:55 2012
@@ -71,7 +71,7 @@ final class VarSortedBytesImpl {
throws IOException {
boolean success = false;
try {
- MergeContext ctx = SortedBytesMergeUtils.init(Type.BYTES_VAR_SORTED, docValues, comp, mergeState.mergedDocCount);
+ MergeContext ctx = SortedBytesMergeUtils.init(Type.BYTES_VAR_SORTED, docValues, comp, mergeState.segmentInfo.getDocCount());
final List<SortedSourceSlice> slices = SortedBytesMergeUtils.buildSlices(mergeState.docBase, mergeState.docMaps, docValues, ctx);
IndexOutput datOut = getOrCreateDataOut();
Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/MergeState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/MergeState.java?rev=1342009&r1=1342008&r2=1342009&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/MergeState.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/MergeState.java Wed May 23 20:06:55 2012
@@ -45,7 +45,6 @@ public class MergeState {
public List<IndexReaderAndLiveDocs> readers; // Readers & liveDocs being merged
public int[][] docMaps; // Maps docIDs around deletions
public int[] docBase; // New docID base per reader
- public int mergedDocCount; // Total # merged docs
public CheckAbort checkAbort;
public InfoStream infoStream;
Modified: lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1342009&r1=1342008&r2=1342009&view=diff
==============================================================================
--- lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/lucene4055/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java Wed May 23 20:06:55 2012
@@ -107,13 +107,11 @@ final class SegmentMerger {
// IndexWriter.close(false) takes to actually stop the
// threads.
- // nocommit: can we nuke this count too?
- mergeState.mergedDocCount = setDocMaps();
- mergeState.segmentInfo.setDocCount(mergeState.mergedDocCount);
+ mergeState.segmentInfo.setDocCount(setDocMaps());
mergeDocValuesAndNormsFieldInfos();
setMatchingSegmentReaders();
int numMerged = mergeFields();
- assert numMerged == mergeState.mergedDocCount;
+ assert numMerged == mergeState.segmentInfo.getDocCount();
final SegmentWriteState segmentWriteState = new SegmentWriteState(mergeState.infoStream, directory, mergeState.segmentInfo,
mergeState.fieldInfos, termIndexInterval, null, context);
@@ -126,7 +124,7 @@ final class SegmentMerger {
if (mergeState.fieldInfos.hasVectors()) {
numMerged = mergeVectors();
- assert numMerged == mergeState.mergedDocCount;
+ assert numMerged == mergeState.segmentInfo.getDocCount();
}
// write the merged infos
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=1342009&r1=1342008&r2=1342009&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 Wed May 23 20:06:55 2012
@@ -84,7 +84,7 @@ public class TestSegmentMerger extends L
merger.add(reader1);
merger.add(reader2);
MergeState mergeState = merger.merge();
- int docsMerged = mergeState.mergedDocCount;
+ int docsMerged = mergeState.segmentInfo.getDocCount();
assertTrue(docsMerged == 2);
//Should be able to open a new SegmentReader against the new directory
SegmentReader mergedReader = new SegmentReader(new SegmentInfoPerCommit(