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/03 13:40:27 UTC
svn commit: r1393437 -
/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Wed Oct 3 11:40:27 2012
New Revision: 1393437
URL: http://svn.apache.org/viewvc?rev=1393437&view=rev
Log:
remove dead code; make assert verbose
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1393437&r1=1393436&r2=1393437&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Wed Oct 3 11:40:27 2012
@@ -2335,10 +2335,9 @@ public class IndexWriter implements Clos
assert !infos.contains(info): "dup info dir=" + info.info.dir + " name=" + info.info.name;
String newSegName = newSegmentName();
- String dsName = info.info.name;
if (infoStream.isEnabled("IW")) {
- infoStream.message("IW", "addIndexes: process segment origName=" + info.info.name + " newName=" + newSegName + " dsName=" + dsName + " info=" + info);
+ infoStream.message("IW", "addIndexes: process segment origName=" + info.info.name + " newName=" + newSegName + " info=" + info);
}
IOContext context = new IOContext(new MergeInfo(info.info.getDocCount(), info.info.sizeInBytes(), true, -1));
@@ -2484,7 +2483,7 @@ public class IndexWriter implements Clos
// Now create the compound file if needed
if (useCompoundFile) {
Collection<String> filesToDelete = infoPerCommit.files();
- try{
+ try {
createCompoundFile(infoStream, directory, MergeState.CheckAbort.NONE, info, context);
} finally {
// delete new non cfs files directly: they were never
@@ -3955,7 +3954,7 @@ public class IndexWriter implements Clos
synchronized(this) {
- assert lastCommitChangeCount <= changeCount;
+ assert lastCommitChangeCount <= changeCount: "lastCommitChangeCount=" + lastCommitChangeCount + " changeCount=" + changeCount;
if (pendingCommitChangeCount == lastCommitChangeCount) {
if (infoStream.isEnabled("IW")) {