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 2013/10/09 17:44:58 UTC
svn commit: r1530685 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: simonw
Date: Wed Oct 9 15:44:57 2013
New Revision: 1530685
URL: http://svn.apache.org/r1530685
Log:
LUCENE-5255: Make DocumentsWriter reference final in IW
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
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=1530685&r1=1530684&r2=1530685&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 Wed Oct 9 15:44:57 2013
@@ -229,7 +229,7 @@ public class IndexWriter implements Clos
final SegmentInfos segmentInfos; // the segments
final FieldNumbers globalFieldNumberMap;
- private DocumentsWriter docWriter;
+ private final DocumentsWriter docWriter;
private final Queue<Event> eventQueue;
final IndexFileDeleter deleter;
@@ -1054,13 +1054,6 @@ public class IndexWriter implements Clos
deleter.close();
}
- // used by assert below
- final DocumentsWriter oldWriter = docWriter;
-
- synchronized (this) {
- docWriter = null;
- }
-
if (infoStream.isEnabled("IW")) {
infoStream.message("IW", "at close: " + segString());
}
@@ -1072,7 +1065,7 @@ public class IndexWriter implements Clos
synchronized(this) {
closed = true;
}
- assert oldWriter.perThreadPool.numDeactivatedThreadStates() == oldWriter.perThreadPool.getMaxThreadStates() : "" + oldWriter.perThreadPool.numDeactivatedThreadStates() + " " + oldWriter.perThreadPool.getMaxThreadStates();
+ assert docWriter.perThreadPool.numDeactivatedThreadStates() == docWriter.perThreadPool.getMaxThreadStates() : "" + docWriter.perThreadPool.numDeactivatedThreadStates() + " " + docWriter.perThreadPool.getMaxThreadStates();
} catch (OutOfMemoryError oom) {
handleOOM(oom, "closeInternal");
} finally {
@@ -1107,14 +1100,7 @@ public class IndexWriter implements Clos
* @see #numDocs */
public synchronized int maxDoc() {
ensureOpen();
- int count;
- if (docWriter != null)
- count = docWriter.getNumDocs();
- else
- count = 0;
-
- count += segmentInfos.totalDocCount();
- return count;
+ return docWriter.getNumDocs() + segmentInfos.totalDocCount();
}
/** Returns total number of docs in this index, including
@@ -1125,12 +1111,7 @@ public class IndexWriter implements Clos
* @see #numDocs */
public synchronized int numDocs() {
ensureOpen();
- int count;
- if (docWriter != null)
- count = docWriter.getNumDocs();
- else
- count = 0;
-
+ int count = docWriter.getNumDocs();
for (final SegmentInfoPerCommit info : segmentInfos) {
count += info.info.getDocCount() - numDeletedDocs(info);
}