svn commit: r945925 - in /lucene/dev/trunk/solr/src/test/org/apache/solr: request/TestWriterPerf.java update/TestIndexingPerformance.java

[ho...@apache.org]

Author: hossman
Date: Tue May 18 22:12:17 2010
New Revision: 945925

URL: http://svn.apache.org/viewvc?rev=945925&view=rev
Log:
change some 'performance' tests so that they use a Logger instead of System.out -- removes some spurrious output from the automated tests (people looking ofr hte perf ouptut can set their logger properties accordingly)

Modified:
    lucene/dev/trunk/solr/src/test/org/apache/solr/request/TestWriterPerf.java
    lucene/dev/trunk/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java

Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/request/TestWriterPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/request/TestWriterPerf.java?rev=945925&r1=945924&r2=945925&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/request/TestWriterPerf.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/request/TestWriterPerf.java Tue May 18 22:12:17 2010
@@ -25,11 +25,18 @@ import org.apache.solr.client.solrj.Resp
 import org.apache.solr.client.solrj.impl.BinaryResponseParser;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.io.*;
 
 
 public class TestWriterPerf extends AbstractSolrTestCase {
+
+  public static final Logger log 
+    = LoggerFactory.getLogger(TestWriterPerf.class);
+
   public String getSchemaFile() { return "schema11.xml"; }
   public String getSolrConfigFile() { return "solrconfig-functionquery.xml"; }
   public String getCoreName() { return "basic"; }
@@ -131,7 +138,7 @@ public class TestWriterPerf extends Abst
 
     long decodeTime = Math.max(System.currentTimeMillis() - start, 1);
 
-    System.out.println("writer "+writerName+", size="+out.size()+", encodeRate="+(encodeTime==1 ? "N/A":  ""+(encIter*1000L/encodeTime)) + ", decodeRate="+(decodeTime==1 ? "N/A":  ""+(decIter*1000L/decodeTime)) );
+    log.info("writer "+writerName+", size="+out.size()+", encodeRate="+(encodeTime==1 ? "N/A":  ""+(encIter*1000L/encodeTime)) + ", decodeRate="+(decodeTime==1 ? "N/A":  ""+(decIter*1000L/decodeTime)) );
 
     req.close();
   }

Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=945925&r1=945924&r2=945925&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java Tue May 18 22:12:17 2010
@@ -24,6 +24,9 @@ import org.apache.solr.schema.IndexSchem
 import org.apache.solr.util.AbstractSolrTestCase;
 import org.apache.solr.common.util.StrUtils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.util.Arrays;
 
@@ -34,6 +37,9 @@ import java.util.Arrays;
  */
 public class TestIndexingPerformance extends AbstractSolrTestCase {
 
+  public static final Logger log 
+    = LoggerFactory.getLogger(TestIndexingPerformance.class);
+
   public String getSchemaFile() { return "schema12.xml"; }
   public String getSolrConfigFile() { return "solrconfig_perf.xml"; }
 
@@ -104,8 +110,8 @@ public class TestIndexingPerformance ext
       updateHandler.addDoc(add);
     }
     long end = System.currentTimeMillis();
-    System.out.println("includeDoc="+includeDoc+" doc="+ Arrays.toString(fields));
-    System.out.println("iter="+iter +" time=" + (end-start) + " throughput=" + ((long)iter*1000)/(end-start));
+    log.info("includeDoc="+includeDoc+" doc="+ Arrays.toString(fields));
+    log.info("iter="+iter +" time=" + (end-start) + " throughput=" + ((long)iter*1000)/(end-start));
 
     //discard all the changes
     updateHandler.rollback(new RollbackUpdateCommand());
@@ -113,4 +119,4 @@ public class TestIndexingPerformance ext
     req.close();
   }
 
-}
\ No newline at end of file
+}