You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2013/01/04 02:15:17 UTC
svn commit: r1428695 - in /lucene/dev/trunk/solr:
core/src/java/org/apache/solr/update/UpdateCommand.java
core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
testlogging.properties
Author: yonik
Date: Fri Jan 4 01:15:17 2013
New Revision: 1428695
URL: http://svn.apache.org/viewvc?rev=1428695&view=rev
Log:
improve logging
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateCommand.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
lucene/dev/trunk/solr/testlogging.properties
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateCommand.java?rev=1428695&r1=1428694&r2=1428695&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateCommand.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateCommand.java Fri Jan 4 01:15:17 2013
@@ -44,7 +44,19 @@ public abstract class UpdateCommand impl
@Override
public String toString() {
- return name() + "{flags="+flags+",_version_="+version;
+ StringBuilder sb = new StringBuilder(50);
+ sb.append(name());
+ sb.append('{');
+ boolean needComma = false;
+ if (flags != 0) {
+ sb.append("flags=").append(Integer.toHexString(flags));
+ needComma = true;
+ }
+ if (version != 0) {
+ if (needComma) sb.append(',');
+ sb.append("_version_=").append(version);
+ }
+ return sb.toString();
}
public long getVersion() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=1428695&r1=1428694&r2=1428695&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java Fri Jan 4 01:15:17 2013
@@ -94,7 +94,7 @@ class LogUpdateProcessor extends UpdateR
@Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
- if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString()); }
+ if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
// call delegate first so we can log things like the version that get set later
if (next != null) next.processAdd(cmd);
@@ -117,7 +117,7 @@ class LogUpdateProcessor extends UpdateR
@Override
public void processDelete( DeleteUpdateCommand cmd ) throws IOException {
- if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString()); }
+ if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
if (next != null) next.processDelete(cmd);
if (cmd.isDeleteById()) {
@@ -145,7 +145,7 @@ class LogUpdateProcessor extends UpdateR
@Override
public void processMergeIndexes(MergeIndexesCommand cmd) throws IOException {
- if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString()); }
+ if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
if (next != null) next.processMergeIndexes(cmd);
toLog.add("mergeIndexes", cmd.toString());
@@ -153,7 +153,7 @@ class LogUpdateProcessor extends UpdateR
@Override
public void processCommit( CommitUpdateCommand cmd ) throws IOException {
- if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString()); }
+ if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
if (next != null) next.processCommit(cmd);
@@ -166,7 +166,7 @@ class LogUpdateProcessor extends UpdateR
*/
@Override
public void processRollback( RollbackUpdateCommand cmd ) throws IOException {
- if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString()); }
+ if (logDebug) { log.debug("PRE_UPDATE " + cmd.toString() + " " + req); }
if (next != null) next.processRollback(cmd);
toLog.add("rollback", "");
@@ -175,7 +175,7 @@ class LogUpdateProcessor extends UpdateR
@Override
public void finish() throws IOException {
- if (logDebug) { log.debug("PRE_UPDATE finish()"); }
+ if (logDebug) { log.debug("PRE_UPDATE FINISH " + req); }
if (next != null) next.finish();
// LOG A SUMMARY WHEN ALL DONE (INFO LEVEL)
Modified: lucene/dev/trunk/solr/testlogging.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/testlogging.properties?rev=1428695&r1=1428694&r2=1428695&view=diff
==============================================================================
--- lucene/dev/trunk/solr/testlogging.properties (original)
+++ lucene/dev/trunk/solr/testlogging.properties Fri Jan 4 01:15:17 2013
@@ -7,8 +7,8 @@ java.util.logging.ConsoleHandler.formatt
#.level=SEVERE
.level=INFO
-#org.apache.solr.update.processor.LogUpdateProcessor=FINEST
-#org.apache.solr.update.processor.DistributedUpdateProcessor=FINEST
+#org.apache.solr.update.processor.LogUpdateProcessor.level=FINEST
+#org.apache.solr.update.processor.DistributedUpdateProcessor.level=FINEST
#org.apache.solr.update.PeerSync.level=FINEST
#org.apache.solr.core.CoreContainer.level=FINEST
#org.apache.solr.cloud.RecoveryStrategy.level=FINEST