svn commit: r1794685 - in /jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark: BenchmarkRunner.java ManyNodes.java

[frm]

Author: frm
Date: Wed May 10 08:37:01 2017
New Revision: 1794685

URL: http://svn.apache.org/viewvc?rev=1794685&view=rev
Log:
OAK-6204 - Reduce the verboseness of the ManyNodes benchmark

Modified:
    
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
    
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyNodes.java

Modified: 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1794685&r1=1794684&r2=1794685&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
 Wed May 10 08:37:01 2017
@@ -29,6 +29,17 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
+import com.codahale.metrics.ConsoleReporter;
+import com.codahale.metrics.Counting;
+import com.codahale.metrics.Metric;
+import com.codahale.metrics.MetricFilter;
+import com.codahale.metrics.MetricRegistry;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.MoreExecutors;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+import joptsimple.OptionSpec;
 import org.apache.commons.io.FileUtils;
 import 
org.apache.jackrabbit.oak.benchmark.authentication.external.ExternalLoginTest;
 import 
org.apache.jackrabbit.oak.benchmark.authentication.external.ListIdentitiesTest;
@@ -45,19 +56,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 
-import com.codahale.metrics.ConsoleReporter;
-import com.codahale.metrics.Counting;
-import com.codahale.metrics.Metric;
-import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.MoreExecutors;
-
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
-import joptsimple.OptionSpec;
-
 public class BenchmarkRunner {
 
     private static final int MB = 1024 * 1024;
@@ -166,6 +164,7 @@ public class BenchmarkRunner {
                 .withOptionalArg().ofType(Integer.class).defaultsTo(2);
         OptionSpec<Integer> pathsPerMount = parser.accepts("pathsPerMount", 
"Number of paths per one mount.")
                 .withOptionalArg().ofType(Integer.class).defaultsTo(1000);
+        OptionSpec<?> verbose = parser.accepts("verbose", "Enable verbose 
output");
         OptionSpec<String> nonOption = parser.nonOptions();
         OptionSpec help = parser.acceptsAll(asList("h", "?", "help"), "show 
help").forHelp();
         OptionSet options = parser.parse(args);
@@ -275,7 +274,7 @@ public class BenchmarkRunner {
                     flatStructure.value(options),
                     report.value(options)),
             new CreateNodesBenchmark(),
-            new ManyNodes(),
+            new ManyNodes(options.has(verbose)),
             new ObservationTest(),
             new RevisionGCTest(),
             new ContinuousRevisionGCTest(),
@@ -527,4 +526,4 @@ public class BenchmarkRunner {
                 (ScheduledThreadPoolExecutor) 
Executors.newScheduledThreadPool(1));
         return new MetricStatisticsProvider(null, executorService);
     }
-}
\ No newline at end of file
+}

Modified: 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyNodes.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyNodes.java?rev=1794685&r1=1794684&r2=1794685&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyNodes.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyNodes.java
 Wed May 10 08:37:01 2017
@@ -26,6 +26,12 @@ import org.apache.jackrabbit.oak.fixture
 
 public class ManyNodes extends Benchmark {
 
+    private final boolean verbose;
+
+    ManyNodes(boolean verbose) {
+        this.verbose = verbose;
+    }
+
     @Override
     public void run(Iterable<RepositoryFixture> fixtures) {
         for (RepositoryFixture fixture : fixtures) {
@@ -70,8 +76,9 @@ public class ManyNodes extends Benchmark
                 session.save();
                 if (total % 10000 == 0) {
                     long now = System.currentTimeMillis();
-                    System.out.println(total + " nodes in "
-                            + (now - time) + " ms");
+                    if (verbose) {
+                        System.out.println(total + " nodes in " + (now - time) 
+ " ms");
+                    }
                     time = now;
                 }
             }