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 2010/11/11 19:08:02 UTC
svn commit: r1034017 - in
/lucene/dev/trunk/lucene/src/java/org/apache/lucene: index/ store/
Author: mikemccand
Date: Thu Nov 11 18:08:02 2010
New Revision: 1034017
URL: http://svn.apache.org/viewvc?rev=1034017&view=rev
Log:
minor improvements to IW's infoStream output, .toString for various classes, etc.
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/FSDirectory.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DirectoryReader.java Thu Nov 11 18:08:02 2010
@@ -320,12 +320,13 @@ class DirectoryReader extends IndexReade
}
buffer.append(getClass().getSimpleName());
buffer.append('(');
+ buffer.append(segmentInfos.getCurrentSegmentFileName());
+ if (writer != null) {
+ buffer.append(":nrt");
+ }
for(int i=0;i<subReaders.length;i++) {
- if (i > 0) {
- buffer.append(' ');
- }
- buffer.append(subReaders[i]);
buffer.append(' ');
+ buffer.append(subReaders[i]);
}
buffer.append(')');
return buffer.toString();
@@ -1007,6 +1008,11 @@ class DirectoryReader extends IndexReade
}
@Override
+ public String toString() {
+ return "DirectoryReader.ReaderCommit(" + segmentsFileName + ")";
+ }
+
+ @Override
public boolean isOptimized() {
return isOptimized;
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java Thu Nov 11 18:08:02 2010
@@ -24,6 +24,7 @@ import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -116,7 +117,7 @@ final class IndexFileDeleter {
}
private void message(String message) {
- infoStream.println("IFD [" + Thread.currentThread().getName() + "]: " + message);
+ infoStream.println("IFD [" + new Date() + "; " + Thread.currentThread().getName() + "]: " + message);
}
private final FilenameFilter indexFilenameFilter;
@@ -546,8 +547,12 @@ final class IndexFileDeleter {
* (have not yet been incref'd). */
void deleteNewFiles(Collection<String> files) throws IOException {
for (final String fileName: files) {
- if (!refCounts.containsKey(fileName))
+ if (!refCounts.containsKey(fileName)) {
+ if (infoStream != null) {
+ message("delete new file \"" + fileName + "\"");
+ }
deleteFile(fileName);
+ }
}
}
@@ -641,6 +646,11 @@ final class IndexFileDeleter {
}
@Override
+ public String toString() {
+ return "IndexFileDeleter.CommitPoint(" + segmentsFileName + ")";
+ }
+
+ @Override
public boolean isOptimized() {
return isOptimized;
}
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java Thu Nov 11 18:08:02 2010
@@ -46,6 +46,7 @@ import java.util.HashSet;
import java.util.LinkedList;
import java.util.Iterator;
import java.util.Map;
+import java.util.Date;
/**
An <code>IndexWriter</code> creates and maintains an index.
@@ -705,7 +706,7 @@ public class IndexWriter implements Clos
*/
public void message(String message) {
if (infoStream != null)
- infoStream.println("IW " + messageID + " [" + Thread.currentThread().getName() + "]: " + message);
+ infoStream.println("IW " + messageID + " [" + new Date() + "; " + Thread.currentThread().getName() + "]: " + message);
}
private synchronized void setMessageID(PrintStream infoStream) {
@@ -2638,6 +2639,10 @@ public class IndexWriter implements Clos
boolean success = false;
+ if (infoStream != null ) {
+ message("rollback");
+ }
+
docWriter.pauseAllThreads();
try {
@@ -3211,11 +3216,13 @@ public class IndexWriter implements Clos
notifyAll();
}
- } else if (infoStream != null)
- message("commit: pendingCommit == null; skip");
+ } else if (infoStream != null) {
+ message("commit: pendingCommit == null; skip");
+ }
- if (infoStream != null)
+ if (infoStream != null) {
message("commit: done");
+ }
}
/**
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java Thu Nov 11 18:08:02 2010
@@ -612,7 +612,7 @@ public final class IndexWriterConfig imp
sb.append("matchVersion=").append(matchVersion).append("\n");
sb.append("analyzer=").append(analyzer == null ? "null" : analyzer.getClass().getName()).append("\n");
sb.append("delPolicy=").append(delPolicy.getClass().getName()).append("\n");
- sb.append("commit=").append(commit == null ? "null" : commit.getClass().getName()).append("\n");
+ sb.append("commit=").append(commit == null ? "null" : commit).append("\n");
sb.append("openMode=").append(openMode).append("\n");
sb.append("maxFieldLength=").append(maxFieldLength).append("\n");
sb.append("similarity=").append(similarity.getClass().getName()).append("\n");
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/LogMergePolicy.java Thu Nov 11 18:08:02 2010
@@ -548,7 +548,7 @@ public abstract class LogMergePolicy ext
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("[");
+ StringBuilder sb = new StringBuilder("[" + getClass().getSimpleName() + ": ");
sb.append("minMergeSize=").append(minMergeSize).append(", ");
sb.append("mergeFactor=").append(mergeFactor).append(", ");
sb.append("maxMergeSize=").append(maxMergeSize).append(", ");
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentInfos.java Thu Nov 11 18:08:02 2010
@@ -513,7 +513,7 @@ public final class SegmentInfos extends
// Method 2: open segments.gen and read its
// contents. Then we take the larger of the two
- // gen's. This way, if either approach is hitting
+ // gens. This way, if either approach is hitting
// a stale cache (NFS) we have a better chance of
// getting the right generation.
long genB = -1;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java Thu Nov 11 18:08:02 2010
@@ -76,6 +76,11 @@ public class SnapshotDeletionPolicy impl
this.cp = cp;
}
+ @Override
+ public String toString() {
+ return "SnapshotDeletionPolicy.SnapshotCommitPoint(" + cp + ")";
+ }
+
/**
* Returns true if this segment can be deleted. The default implementation
* returns false if this segment is currently held as snapshot.
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/Directory.java Thu Nov 11 18:08:02 2010
@@ -197,6 +197,11 @@ public abstract class Directory implemen
return this.toString();
}
+ @Override
+ public String toString() {
+ return super.toString() + " lockFactory=" + getLockFactory();
+ }
+
/**
* Copies the file <i>src</i> to {@link Directory} <i>to</i> under the new
* file name <i>dest</i>.
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/FSDirectory.java?rev=1034017&r1=1034016&r2=1034017&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/FSDirectory.java Thu Nov 11 18:08:02 2010
@@ -398,7 +398,7 @@ public abstract class FSDirectory extend
/** For debug output. */
@Override
public String toString() {
- return this.getClass().getName() + "@" + directory;
+ return this.getClass().getName() + "@" + directory + " lockFactory=" + getLockFactory();
}
/**