svn commit: r529452 - /lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java

[kl...@apache.org]

Author: klaas
Date: Mon Apr 16 17:20:59 2007
New Revision: 529452

URL: http://svn.apache.org/viewvc?view=rev&rev=529452
Log:
AutoCommit tracker again prints to the logfile its parameters.  There parameters are also 
available in the DUH2 admin ui statistics

Modified:
    lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java

Modified: lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java?view=diff&rev=529452&r1=529451&r2=529452
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/DirectUpdateHandler2.java Mon Apr 16 17:20:59 2007
@@ -589,7 +589,7 @@
     
     // state
     long docsSinceCommit;    
-    int autoCommitCount= 0;
+    int autoCommitCount = 0;
     long lastAddedTime = -1;
     
     public CommitTracker() {
@@ -599,7 +599,7 @@
       docsUpperBound = SolrConfig.config.getInt("updateHandler/autoCommit/maxDocs", -1);
       timeUpperBound = SolrConfig.config.getInt("updateHandler/autoCommit/maxTime", -1);
 
-      SolrCore.log.info("CommitTracker: " + this);
+      SolrCore.log.info("AutoCommit: " + this);
     }
 
     /** Indicate that documents have been added
@@ -655,6 +655,17 @@
         }
       }
     }
+
+    public String toString() {
+      if(timeUpperBound > 0 || docsUpperBound > 0) {
+        return 
+          (timeUpperBound > 0 ? ("if uncommited for " + timeUpperBound + "ms; ") : "") +
+          (docsUpperBound > 0 ? ("if " + docsUpperBound + " uncommited docs ") : "");
+
+      } else {
+        return "disabled";
+      }
+    }
   }
       
   
@@ -693,6 +704,12 @@
   public NamedList getStatistics() {
     NamedList lst = new SimpleOrderedMap();
     lst.add("commits", commitCommands.get());
+    if (tracker.docsUpperBound > 0) {
+      lst.add("autocommit maxDocs", tracker.docsUpperBound);
+    }
+    if (tracker.timeUpperBound > 0) {
+      lst.add("autocommit maxTime", "" + tracker.timeUpperBound + "ms");
+    }
     lst.add("autocommits", tracker.autoCommitCount);
     lst.add("optimizes", optimizeCommands.get());
     lst.add("docsPending", numDocsPending.get());