jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1449778 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: BenchmarkRunner.java wikipedia/WikipediaImport.java
Date Mon, 25 Feb 2013 16:55:17 GMT
Author: jukka
Date: Mon Feb 25 16:55:16 2013
New Revision: 1449778

URL: http://svn.apache.org/r1449778
Log:
OAK-641: Improved benchmark tooling

Better output formatting

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1449778&r1=1449777&r2=1449778&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
(original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
Mon Feb 25 16:55:16 2013
@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.benchmark;
 
 import java.io.File;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
@@ -35,23 +34,6 @@ import com.google.common.collect.Sets;
 
 public class BenchmarkRunner {
 
-    private static final Benchmark[] BENCHMARKS = new Benchmark[] {
-            new LoginTest(),
-            new LoginLogoutTest(),
-            new ReadPropertyTest(),
-            new SetPropertyTest(),
-            new SmallFileReadTest(),
-            new SmallFileWriteTest(),
-            new ConcurrentReadTest(),
-            new ConcurrentReadWriteTest(),
-            new SimpleSearchTest(),
-            new SQL2SearchTest(),
-            new DescendantSearchTest(),
-            new SQL2DescendantSearchTest(),
-            new CreateManyChildNodesTest(),
-            new UpdateManyChildNodesTest(),
-            new TransientManyChildNodesTest() };
-
     public static void main(String[] args) throws Exception {
         OptionParser parser = new OptionParser();
         OptionSpec<String> host = parser.accepts("host", "MongoDB host")

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java?rev=1449778&r1=1449777&r2=1449778&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
(original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
Mon Feb 25 16:55:16 2013
@@ -42,11 +42,10 @@ public class WikipediaImport extends Ben
     @Override
     public void run(Iterable<RepositoryFixture> fixtures) {
         if (dump.isFile()) {
-            System.out.format("Wikipedia import (%s)%n", dump);
             for (RepositoryFixture fixture : fixtures) {
                 if (fixture.isAvailable(1)) {
                     try {
-                        System.out.format("%s: importing Wikipedia...%n", fixture);
+                        System.out.format("%s: importing %s...%n", fixture, dump);
                         Repository[] cluster = fixture.setUpCluster(1);
                         try {
                             run(cluster[0]);
@@ -100,8 +99,8 @@ public class WikipediaImport extends Ben
                         if (pages % 1000 == 0) {
                             long millis = System.currentTimeMillis() - start;
                             System.out.format(
-                                    "Imported %d pages in %d seconds (%dus/page)%n",
-                                    pages, millis / 1000, millis * 1000 / pages);
+                                    "Added %d pages in %d seconds (%.2fms/page)%n",
+                                    pages, millis / 1000, (double) millis / pages);
                         }
 
                     }
@@ -116,8 +115,8 @@ public class WikipediaImport extends Ben
 
         long millis = System.currentTimeMillis() - start;
         System.out.format(
-                "Imported %d pages in %d seconds (%dus/page)%n",
-                pages, millis / 1000, millis * 1000 / pages);
+                "Imported %d pages in %d seconds (%.2fms/page)%n",
+                pages, millis / 1000, (double) millis / pages);
     }
 
 }



Mime
View raw message