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/06/01 00:20:02 UTC
svn commit: r1344929 - in
/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index:
BufferedDeletes.java DocumentsWriterFlushControl.java IndexWriter.java
SegmentInfoPerCommit.java
Author: mikemccand
Date: Thu May 31 22:20:01 2012
New Revision: 1344929
URL: http://svn.apache.org/viewvc?rev=1344929&view=rev
Log:
fix verbosity when infoStream is on
Modified:
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BufferedDeletes.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BufferedDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BufferedDeletes.java?rev=1344929&r1=1344928&r2=1344929&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BufferedDeletes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/BufferedDeletes.java Thu May 31 22:20:01 2012
@@ -93,7 +93,7 @@ class BufferedDeletes {
} else {
String s = "gen=" + gen;
if (numTermDeletes.get() != 0) {
- s += " " + numTermDeletes.get() + " deleted terms (unique count=" + terms.size() + ") terms=" + terms.keySet();
+ s += " " + numTermDeletes.get() + " deleted terms (unique count=" + terms.size() + ")";
}
if (queries.size() != 0) {
s += " " + queries.size() + " deleted queries";
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java?rev=1344929&r1=1344928&r2=1344929&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java Thu May 31 22:20:01 2012
@@ -482,7 +482,7 @@ final class DocumentsWriterFlushControl
void addFlushableState(ThreadState perThread) {
if (documentsWriter.infoStream.isEnabled("DWFC")) {
- documentsWriter.infoStream.message("DWFC", Thread.currentThread().getName() + ": addFlushableState " + perThread.dwpt);
+ documentsWriter.infoStream.message("DWFC", "addFlushableState " + perThread.dwpt);
}
final DocumentsWriterPerThread dwpt = perThread.dwpt;
assert perThread.isHeldByCurrentThread();
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=1344929&r1=1344928&r2=1344929&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 May 31 22:20:01 2012
@@ -2125,7 +2125,7 @@ public class IndexWriter implements Clos
nextGen = bufferedDeletesStream.getNextGen();
}
if (infoStream.isEnabled("IW")) {
- infoStream.message("IW", "publish sets newSegment delGen=" + nextGen + " seg=" + newSegment);
+ infoStream.message("IW", "publish sets newSegment delGen=" + nextGen + " seg=" + segString(newSegment));
}
newSegment.setBufferedDeletesGen(nextGen);
segmentInfos.add(newSegment);
@@ -3235,7 +3235,7 @@ public class IndexWriter implements Clos
}
for(SegmentInfoPerCommit info : merge.segments) {
if (infoStream.isEnabled("IW")) {
- infoStream.message("IW", "registerMerge info=" + info);
+ infoStream.message("IW", "registerMerge info=" + segString(info));
}
mergingSegments.add(info);
}
@@ -3475,11 +3475,11 @@ public class IndexWriter implements Clos
if (infoStream.isEnabled("IW")) {
if (rld.getPendingDeleteCount() != 0) {
- infoStream.message("IW", "seg=" + info + " delCount=" + info.getDelCount() + " pendingDelCount=" + rld.getPendingDeleteCount());
+ infoStream.message("IW", "seg=" + segString(info) + " delCount=" + info.getDelCount() + " pendingDelCount=" + rld.getPendingDeleteCount());
} else if (info.getDelCount() != 0) {
- infoStream.message("IW", "seg=" + info + " delCount=" + info.getDelCount());
+ infoStream.message("IW", "seg=" + segString(info) + " delCount=" + info.getDelCount());
} else {
- infoStream.message("IW", "seg=" + info + " no deletes");
+ infoStream.message("IW", "seg=" + segString(info) + " no deletes");
}
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java?rev=1344929&r1=1344928&r2=1344929&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java Thu May 31 22:20:01 2012
@@ -132,6 +132,15 @@ public class SegmentInfoPerCommit {
}
@Override
+ public String toString() {
+ String s = info.toString(info.dir, delCount);
+ if (delGen != -1) {
+ s += ":delGen=" + delGen;
+ }
+ return s;
+ }
+
+ @Override
public SegmentInfoPerCommit clone() {
return new SegmentInfoPerCommit(info, delCount, delGen);
}