You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/01/18 17:17:06 UTC
svn commit: r1232946 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/ lucene/contrib/analyzers/common/
lucene/contrib/analyzers/kuromoji/
lucene/src/java/org/apache/lucene/index/IndexWriter.java solr/ solr/core/
Author: simonw
Date: Wed Jan 18 16:17:05 2012
New Revision: 1232946
URL: http://svn.apache.org/viewvc?rev=1232946&view=rev
Log:
remove files of dropped segments right after merge
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/common/ (props changed)
lucene/dev/branches/branch_3x/lucene/contrib/analyzers/kuromoji/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/core/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1232946&r1=1232945&r2=1232946&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java Wed Jan 18 16:17:05 2012
@@ -3808,6 +3808,8 @@ public class IndexWriter implements Clos
if (dropSegment) {
readerPool.drop(merge.info);
+ deleter.deleteNewFiles(merge.info.files());
+ assert !segmentInfos.contains(merge.info);
}
if (infoStream != null) {
@@ -3825,7 +3827,7 @@ public class IndexWriter implements Clos
// disk, updating SegmentInfo, etc.:
readerPool.clear(merge.segments);
- if (merge.maxNumSegments != -1) {
+ if (merge.maxNumSegments != -1 && !dropSegment) {
// cascade the forceMerge:
if (!segmentsToMerge.containsKey(merge.info)) {
segmentsToMerge.put(merge.info, Boolean.FALSE);