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 2012/10/16 17:41:03 UTC
svn commit: r1398853 - in /lucene/dev/branches/branch_4x: ./
lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Tue Oct 16 15:41:03 2012
New Revision: 1398853
URL: http://svn.apache.org/viewvc?rev=1398853&view=rev
Log:
don't call merged segment warmer on 100% deleted segment; drop the merged reader from the pool if it's 100% deleted
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.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=1398853&r1=1398852&r2=1398853&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 Tue Oct 16 15:41:03 2012
@@ -44,7 +44,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FlushInfo;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockObtainFailedException;
@@ -54,7 +53,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.InfoStream;
-import org.apache.lucene.util.MutableBits;
import org.apache.lucene.util.ThreadInterruptedException;
/**
@@ -3164,13 +3162,11 @@ public class IndexWriter implements Clos
mergedDeletes.dropChanges();
}
readerPool.release(mergedDeletes);
- if (dropSegment) {
- readerPool.drop(mergedDeletes.info);
- }
}
if (dropSegment) {
assert !segmentInfos.contains(merge.info);
+ readerPool.drop(merge.info);
deleter.deleteNewFiles(merge.info.files());
}
@@ -3782,8 +3778,7 @@ public class IndexWriter implements Clos
}
final IndexReaderWarmer mergedSegmentWarmer = config.getMergedSegmentWarmer();
-
- if (poolReaders && mergedSegmentWarmer != null) {
+ if (poolReaders && mergedSegmentWarmer != null && merge.info.info.getDocCount() != 0) {
final ReadersAndLiveDocs rld = readerPool.get(merge.info, true);
final SegmentReader sr = rld.getReader(IOContext.READ);
try {