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 2013/02/21 14:17:21 UTC
svn commit: r1448629 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
Author: mikemccand
Date: Thu Feb 21 13:17:20 2013
New Revision: 1448629
URL: http://svn.apache.org/r1448629
Log:
LUCENE-4775: move computation of merge bytes size earlier
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1448629&r1=1448628&r2=1448629&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Feb 21 13:17:20 2013
@@ -3408,6 +3408,18 @@ public class IndexWriter implements Clos
mergingSegments.add(info);
}
+ assert merge.estimatedMergeBytes == 0;
+ assert merge.totalMergeBytes == 0;
+ for(SegmentInfoPerCommit info : merge.segments) {
+ if (info.info.getDocCount() > 0) {
+ final int delCount = numDeletedDocs(info);
+ assert delCount <= info.info.getDocCount();
+ final double delRatio = ((double) delCount)/info.info.getDocCount();
+ merge.estimatedMergeBytes += info.sizeInBytes() * (1.0 - delRatio);
+ merge.totalMergeBytes += info.sizeInBytes();
+ }
+ }
+
// Merge is now registered
merge.registerDone = true;
@@ -3496,17 +3508,6 @@ public class IndexWriter implements Clos
if (infoStream.isEnabled("IW")) {
infoStream.message("IW", "merge seg=" + merge.info.info.name + " " + segString(merge.segments));
}
-
- assert merge.estimatedMergeBytes == 0;
- for(SegmentInfoPerCommit info : merge.segments) {
- if (info.info.getDocCount() > 0) {
- final int delCount = numDeletedDocs(info);
- assert delCount <= info.info.getDocCount();
- final double delRatio = ((double) delCount)/info.info.getDocCount();
- merge.estimatedMergeBytes += info.sizeInBytes() * (1.0 - delRatio);
- merge.totalMergeBytes += info.sizeInBytes();
- }
- }
}
static void setDiagnostics(SegmentInfo info, String source) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1448629&r1=1448628&r2=1448629&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Thu Feb 21 13:17:20 2013
@@ -365,6 +365,7 @@ public class TestConcurrentMergeSchedule
w.deleteDocuments(new Term("id", ""+random().nextInt(i+1)));
}
}
+ assertTrue(((TrackingCMS) iwc.getMergeScheduler()).totMergedBytes != 0);
w.close();
d.close();
}