Index: oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (date 1404127406000) +++ oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (revision ) @@ -110,8 +110,6 @@ RepositoryFixture[] allFixtures = new RepositoryFixture[] { new JackrabbitRepositoryFixture(base.value(options), cacheSize), OakRepositoryFixture.getMemoryNS(cacheSize * MB), - OakRepositoryFixture.getMemoryMK(cacheSize * MB), - OakRepositoryFixture.getH2MK(base.value(options), cacheSize * MB), OakRepositoryFixture.getMongo( host.value(options), port.value(options), dbName.value(options), dropDBAfterTest.value(options), Index: oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (date 1404127406000) +++ oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (revision ) @@ -22,13 +22,10 @@ import javax.sql.DataSource; import com.google.common.collect.Maps; - import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.core.data.DataStore; import org.apache.jackrabbit.core.data.DataStoreException; import org.apache.jackrabbit.core.data.FileDataStore; -import org.apache.jackrabbit.mk.api.MicroKernel; -import org.apache.jackrabbit.mk.core.MicroKernelImpl; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.commons.PropertiesUtil; import org.apache.jackrabbit.oak.kernel.KernelNodeStore; @@ -49,7 +46,6 @@ public static final String OAK_MEMORY = "Oak-Memory"; public static final String OAK_MEMORY_NS = "Oak-MemoryNS"; - public static final String OAK_MEMORY_MK = "Oak-MemoryMK"; public static final String OAK_MONGO = "Oak-Mongo"; public static final String OAK_MONGO_FDS = "Oak-Mongo-FDS"; @@ -58,7 +54,6 @@ public static final String OAK_RDB = "Oak-RDB"; - public static final String OAK_H2 = "Oak-H2"; public static final String OAK_TAR = "Oak-Tar"; public static final String OAK_TAR_FDS = "Oak-Tar-FDS"; @@ -85,28 +80,19 @@ } public static OakFixture getMemory(long cacheSize) { - return getMemory(OAK_MEMORY, false, cacheSize); + return getMemory(OAK_MEMORY, cacheSize); } public static OakFixture getMemoryNS(long cacheSize) { - return getMemory(OAK_MEMORY_NS, false, cacheSize); + return getMemory(OAK_MEMORY_NS, cacheSize); } - public static OakFixture getMemoryMK(long cacheSize) { - return getMemory(OAK_MEMORY_MK, true, cacheSize); - } - - public static OakFixture getMemory(String name, final boolean useMk, final long cacheSize) { + public static OakFixture getMemory(String name, final long cacheSize) { return new OakFixture(name) { @Override public Oak getOak(int clusterId) throws Exception { Oak oak; - if (useMk) { - MicroKernel kernel = new MicroKernelImpl(); - oak = new Oak(new KernelNodeStore(kernel, cacheSize)); - } else { - oak = new Oak(new MemoryNodeStore()); + oak = new Oak(new MemoryNodeStore()); - } return oak; } @@ -115,12 +101,7 @@ Oak[] cluster = new Oak[n]; for (int i = 0; i < cluster.length; i++) { Oak oak; - if (useMk) { - MicroKernel kernel = new MicroKernelImpl(); - oak = new Oak(new KernelNodeStore(kernel, cacheSize)); - } else { - oak = new Oak(new MemoryNodeStore()); + oak = new Oak(new MemoryNodeStore()); - } cluster[i] = oak; } return cluster; @@ -423,34 +404,4 @@ }; } - - - public static OakFixture getH2MK(final File base, final long cacheSize) { - return new OakFixture(OAK_H2) { - private MicroKernelImpl[] kernels; - - @Override - public Oak getOak(int clusterId) throws Exception { - return new Oak(new KernelNodeStore(new MicroKernelImpl(base.getPath()), cacheSize)); - } - - @Override - public Oak[] setUpCluster(int n) throws Exception { - Oak[] cluster = new Oak[n]; - kernels = new MicroKernelImpl[cluster.length]; - for (int i = 0; i < cluster.length; i++) { - kernels[i] = new MicroKernelImpl(new File(base, unique).getPath()); - cluster[i] = new Oak(new KernelNodeStore(kernels[i], cacheSize)); - } - return cluster; - } - @Override - public void tearDownCluster() { - for (MicroKernelImpl kernel : kernels) { - kernel.dispose(); - } - FileUtils.deleteQuietly(new File(base, unique)); - } - }; - } } \ No newline at end of file Index: oak-run/README.md IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-run/README.md (date 1404127406000) +++ oak-run/README.md (revision ) @@ -146,7 +146,6 @@ | Oak-MongoMK | Oak with the Mongo MicroKernel | | Oak-Tar | Oak with the Tar backend (aka Segment NodeStore) | | Oak-Tar-FDS | Oak with the Tar backend and FileDataStore | -| Oak-H2 | Oak with the MK using embedded H2 database | Depending on the fixture the following options are available: @@ -156,7 +155,7 @@ --port 27101 - MongoDB port --db - MongoDB database (default is a generated name) --clusterIds - Cluster Ids for the Mongo setup: a comma separated list of integers - --base - Tar and H2: Path to the base file + --base - Tar: Path to the base file --mmap <64bit?> - TarMK memory mapping (the default on 64 bit JVMs) Examples: @@ -183,7 +182,7 @@ --port 27101 - MongoDB port --db - MongoDB database (default is a generated name) --dropDBAfterTest true - Whether to drop the MongoDB database after the test - --base target - Path to the base file (Tar and H2 setup), + --base target - Path to the base file (Tar setup), --mmap <64bit?> - TarMK memory mapping (the default on 64 bit JVMs) --cache 100 - cache size (in MB) --wikipedia - Wikipedia dump @@ -201,8 +200,7 @@ WikipediaImport test case and the MongoDB address information by the MongoMK and SegmentMK -based repository fixtures. The cache setting controls the bundle cache size in Jackrabbit, the KernelNodeState -cache size in MongoMK and the default H2 MK, and the segment cache -size in SegmentMK. +cache size in MongoMK, and the segment cache size in SegmentMK. The `--concurrency` levels can be specified as comma separated list of values, eg: `--concurrency 1,4,8`, which will execute the same test with the number of @@ -251,7 +249,6 @@ | Oak-MongoNS | Oak with the Mongo NodeStore | | Oak-MongoMK | Oak with the Mongo MicroKernel | | Oak-Tar | Oak with the Tar backend (aka Segment NodeStore) | -| Oak-H2 | Oak with the MK using embedded H2 database | | Oak-RDB | Oak with the DocumentMK/RDB persistence | (Note that for Oak-RDB, the required JDBC drivers either need to be embedded @@ -379,7 +376,7 @@ --port 27101 - MongoDB port --db - MongoDB database (default is a generated name) --dropDBAfterTest true - Whether to drop the MongoDB database after the test - --base target - Path to the base file (Tar and H2 setup), + --base target - Path to the base file (Tar setup), --mmap <64bit?> - TarMK memory mapping (the default on 64 bit JVMs) --cache 100 - cache size (in MB) --csvFile - Optional csv file to report the benchmark results @@ -390,8 +387,8 @@ These options are passed to the various suites and repository fixtures that need them. For example the the MongoDB address information by the MongoMK and SegmentMK -based repository fixtures. The cache setting -controls the KernelNodeState cache size in MongoMK and the default H2 MK, and the -segment cache size in SegmentMK. +controls the KernelNodeState cache size in MongoMK, and the segment +cache size in SegmentMK. You can use extra JVM options like `-Xmx` settings to better control the scalability suite test environment. It's also possible to attach the JVM to a @@ -426,7 +423,6 @@ | Oak-MongoNS | Oak with the Mongo NodeStore | | Oak-MongoMK | Oak with the Mongo MicroKernel | | Oak-Tar | Oak with the Tar backend (aka Segment NodeStore) | -| Oak-H2 | Oak with the MK using embedded H2 database | | Oak-RDB | Oak with the DocumentMK/RDB persistence | (Note that for Oak-RDB, the required JDBC drivers either need to be embedded \ No newline at end of file Index: oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (date 1404127406000) +++ oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (revision ) @@ -16,6 +16,9 @@ */ package org.apache.jackrabbit.oak.run; +import static com.google.common.collect.Sets.newHashSet; +import static java.util.Arrays.asList; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -38,11 +41,9 @@ import com.google.common.collect.Queues; import com.mongodb.MongoClient; import com.mongodb.MongoClientURI; - import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; - import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.config.RepositoryConfig; import org.apache.jackrabbit.oak.Oak; @@ -80,9 +81,6 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import static com.google.common.collect.Sets.newHashSet; -import static java.util.Arrays.asList; - public class Main { public static final int PORT = 8080; @@ -454,8 +452,6 @@ if (fix.startsWith(OakFixture.OAK_MEMORY)) { if (OakFixture.OAK_MEMORY_NS.equals(fix)) { oakFixture = OakFixture.getMemoryNS(cacheSize * MB); - } else if (OakFixture.OAK_MEMORY_MK.equals(fix)) { - oakFixture = OakFixture.getMemoryMK(cacheSize * MB); } else { oakFixture = OakFixture.getMemory(cacheSize * MB); } @@ -486,12 +482,6 @@ throw new IllegalArgumentException("Required argument base missing."); } oakFixture = OakFixture.getTar(OakFixture.OAK_TAR, baseFile, 256, cacheSize, mmap.value(options), false); - } else if (fix.equals(OakFixture.OAK_H2)) { - File baseFile = base.value(options); - if (baseFile == null) { - throw new IllegalArgumentException("Required argument base missing."); - } - oakFixture = OakFixture.getH2MK(baseFile, cacheSize * MB); } else { throw new IllegalArgumentException("Unsupported repository setup " + fix); } Index: oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java (date 1404127406000) +++ oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java (revision ) @@ -93,8 +93,6 @@ RepositoryFixture[] allFixtures = new RepositoryFixture[] { new JackrabbitRepositoryFixture(base.value(options), cacheSize), OakRepositoryFixture.getMemoryNS(cacheSize * MB), - OakRepositoryFixture.getMemoryMK(cacheSize * MB), - OakRepositoryFixture.getH2MK(base.value(options), cacheSize * MB), OakRepositoryFixture.getMongo( host.value(options), port.value(options), dbName.value(options), dropDBAfterTest.value(options), Index: oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (date 1404127406000) +++ oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (revision ) @@ -26,19 +26,11 @@ public class OakRepositoryFixture implements RepositoryFixture { public static RepositoryFixture getMemoryNS(long cacheSize) { - return getMemory(OakFixture.OAK_MEMORY_NS, false, cacheSize); + return getMemory(OakFixture.OAK_MEMORY_NS, cacheSize); } - public static RepositoryFixture getMemoryMK(long cacheSize) { - return getMemory(OakFixture.OAK_MEMORY_MK, true, cacheSize); - } - - private static RepositoryFixture getMemory(String name, boolean useMK, long cacheSize) { - return new OakRepositoryFixture(OakFixture.getMemory(name, useMK, cacheSize)); - } - - public static RepositoryFixture getH2MK(File base, long cacheSize) { - return new OakRepositoryFixture(OakFixture.getH2MK(base, cacheSize)); + private static RepositoryFixture getMemory(String name, long cacheSize) { + return new OakRepositoryFixture(OakFixture.getMemory(name, cacheSize)); } public static RepositoryFixture getMongo(String host, int port, String database,