You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by fr...@apache.org on 2017/05/10 08:15:56 UTC
svn commit: r1794681 -
/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
Author: frm
Date: Wed May 10 08:15:56 2017
New Revision: 1794681
URL: http://svn.apache.org/viewvc?rev=1794681&view=rev
Log:
OAK-6203 - Skip the WikipediaImport benchmark if no dump is specified
Modified:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java?rev=1794681&r1=1794680&r2=1794681&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/wikipedia/WikipediaImport.java Wed May 10 08:15:56 2017
@@ -63,29 +63,31 @@ public class WikipediaImport extends Ben
@Override
public void run(Iterable<RepositoryFixture> fixtures) {
- if (dump.isFile()) {
- for (RepositoryFixture fixture : fixtures) {
- if (fixture.isAvailable(1)) {
- System.out.format(
- "%s: Wikipedia import benchmark%n", fixture);
+ if (dump == null) {
+ System.out.format("Missing Wikipedia dump, skipping import benchmark.%n");
+ return;
+ }
+ if (!dump.isFile()) {
+ System.out.format("The Wikipedia dump at %s is not a file, skipping import benchmark.%n", dump.getPath());
+ return;
+ }
+ for (RepositoryFixture fixture : fixtures) {
+ if (fixture.isAvailable(1)) {
+ System.out.format(
+ "%s: Wikipedia import benchmark%n", fixture);
+ try {
+ Repository[] cluster = setupCluster(fixture);
try {
- Repository[] cluster = setupCluster(fixture);
- try {
- run(cluster[0]);
- } finally {
- tearDown(fixture);
- }
- } catch (Exception e) {
- e.printStackTrace();
+ run(cluster[0]);
+ } finally {
+ tearDown(fixture);
}
- } else {
- System.out.format("%s: not available, skipping.%n", fixture);
+ } catch (Exception e) {
+ e.printStackTrace();
}
+ } else {
+ System.out.format("%s: not available, skipping.%n", fixture);
}
- } else {
- System.out.format(
- "Missing Wikipedia dump %s, skipping import benchmark.%n",
- dump.getPath());
}
}