Author: tomekr
Date: Tue Apr 16 11:06:10 2019
New Revision: 1857641
URL: http://svn.apache.org/viewvc?rev=1857641&view=rev
Log:
OAK-8185: Improve CompositeNodeStore fixture
- remove unused parameters
Modified:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.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=1857641&r1=1857640&r2=1857641&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
Tue Apr 16 11:06:10 2019
@@ -174,10 +174,6 @@ public class BenchmarkRunner {
OptionSpec<Boolean> transientWrites = parser.accepts("transient", "Do
not save data.")
.withOptionalArg().ofType(Boolean.class)
.defaultsTo(Boolean.FALSE);
- OptionSpec<Integer> mounts = parser.accepts("mounts", "Number of
mounts for the composite node store.")
- .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<Integer> vgcMaxAge = parser.accepts("vgcMaxAge",
"Continuous DocumentNodeStore VersionGC max age in sec (RDB only)")
.withRequiredArg().ofType(Integer.class).defaultsTo(-1);
OptionSpec<Integer> coldSyncInterval =
parser.accepts("coldSyncInterval", "interval between sync cycles in sec
(Segment-Tar-Cold only)")
@@ -257,10 +253,10 @@ public class BenchmarkRunner {
dropDBAfterTest.value(options), cacheSize * MB,
base.value(options),
fdsCache.value(options), vgcMaxAge.value(options)),
OakRepositoryFixture.getCompositeStore(base.value(options),
256, cacheSize,
- mmap.value(options), mounts.value(options),
pathsPerMount.value(options)),
-
OakRepositoryFixture.getCompositeMemoryStore(mounts.value(options),
pathsPerMount.value(options)),
+ mmap.value(options)),
+ OakRepositoryFixture.getCompositeMemoryStore(),
OakRepositoryFixture.getCompositeMongoStore(uri, cacheSize *
MB,
- dropDBAfterTest.value(options), mounts.value(options),
pathsPerMount.value(options))
+ dropDBAfterTest.value(options))
};
Benchmark[] allBenchmarks = new Benchmark[] {
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java?rev=1857641&r1=1857640&r2=1857641&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java
Tue Apr 16 11:06:10 2019
@@ -51,10 +51,6 @@ import static org.apache.jackrabbit.oak.
abstract class CompositeStoreFixture extends OakFixture {
- private final int mounts;
-
- private final int pathsPerMount;
-
private static final MountInfoProvider MOUNT_INFO_PROVIDER =
Mounts.newBuilder()
.mount("libs", true, asList(
"/oak:index/*$" // pathsSupportingFragments
@@ -64,14 +60,12 @@ abstract class CompositeStoreFixture ext
"/jcr:system/rep:permissionStore/oak:mount-libs-crx.default"))
.build();
- private CompositeStoreFixture(String name, int mounts, int pathsPerMount) {
+ private CompositeStoreFixture(String name) {
super(name);
- this.mounts = mounts;
- this.pathsPerMount = pathsPerMount;
}
- static OakFixture newCompositeMemoryFixture(String name, int mounts, int
pathsPerMount) {
- return new CompositeStoreFixture(name, mounts, pathsPerMount) {
+ static OakFixture newCompositeMemoryFixture(String name) {
+ return new CompositeStoreFixture(name) {
@Override
protected NodeStore getNodeStore() {
return new MemoryNodeStore();
@@ -85,8 +79,8 @@ abstract class CompositeStoreFixture ext
}
static OakFixture newCompositeSegmentFixture(String name, File base, int
maxFileSizeMB, int cacheSizeMB,
- boolean memoryMapping, int
mounts, int pathsPerMount) {
- return new CompositeStoreFixture(name, mounts, pathsPerMount) {
+ boolean memoryMapping) {
+ return new CompositeStoreFixture(name) {
private FileStore fileStore;
@@ -113,10 +107,8 @@ abstract class CompositeStoreFixture ext
static OakFixture newCompositeMongoFixture(String name,
String uri,
boolean dropDBAfterTest,
- long cacheSize,
- int mounts,
- int pathsPerMount) {
- return new CompositeStoreFixture(name, mounts, pathsPerMount) {
+ long cacheSize) {
+ return new CompositeStoreFixture(name) {
private String database = new MongoClientURI(uri).getDatabase();
private DocumentNodeStore ns;
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1857641&r1=1857640&r2=1857641&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
Tue Apr 16 11:06:10 2019
@@ -363,22 +363,19 @@ public abstract class OakFixture {
}
public static OakFixture getCompositeStore(final String name, final File
base,
- final int maxFileSizeMB, final
int cacheSizeMB, final boolean memoryMapping,
- final int mounts, final int
pathsPerMount) {
- return newCompositeSegmentFixture(name, base, maxFileSizeMB,
cacheSizeMB, memoryMapping, mounts, pathsPerMount);
+ final int maxFileSizeMB, final
int cacheSizeMB, final boolean memoryMapping) {
+ return newCompositeSegmentFixture(name, base, maxFileSizeMB,
cacheSizeMB, memoryMapping);
}
- public static OakFixture getCompositeMemoryStore(final String name, final
int mounts, final int pathsPerMount) {
- return newCompositeMemoryFixture(name, mounts, pathsPerMount);
+ public static OakFixture getCompositeMemoryStore(final String name) {
+ return newCompositeMemoryFixture(name);
}
public static OakFixture getCompositeMongoStore(String name,
String uri,
long cacheSize,
- boolean dropDBAfterTest,
- int mounts,
- int pathsPerMount) {
- return newCompositeMongoFixture(name, uri, dropDBAfterTest, cacheSize,
mounts, pathsPerMount);
+ boolean dropDBAfterTest) {
+ return newCompositeMongoFixture(name, uri, dropDBAfterTest, cacheSize);
}
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1857641&r1=1857640&r2=1857641&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
Tue Apr 16 11:06:10 2019
@@ -122,21 +122,19 @@ public class OakRepositoryFixture implem
}
public static RepositoryFixture getCompositeStore(File base, int
maxFileSizeMB, int cacheSizeMB,
- final boolean
memoryMapping, int mounts, int pathsPerMount) {
+ final boolean
memoryMapping) {
return new
OakRepositoryFixture(OakFixture.getCompositeStore(OakFixture.OAK_COMPOSITE_STORE,
- base, maxFileSizeMB, cacheSizeMB, memoryMapping, mounts,
pathsPerMount));
+ base, maxFileSizeMB, cacheSizeMB, memoryMapping));
}
- public static RepositoryFixture getCompositeMemoryStore(int mounts, int
pathsPerMount) {
- return new
OakRepositoryFixture(OakFixture.getCompositeMemoryStore(OakFixture.OAK_COMPOSITE_MEMORY_STORE,
mounts, pathsPerMount));
+ public static RepositoryFixture getCompositeMemoryStore() {
+ return new
OakRepositoryFixture(OakFixture.getCompositeMemoryStore(OakFixture.OAK_COMPOSITE_MEMORY_STORE));
}
- public static RepositoryFixture getCompositeMongoStore(String uri, long
cacheSize, boolean dropDBAfterTest,
- int mounts, int
pathsPerMount) {
+ public static RepositoryFixture getCompositeMongoStore(String uri, long
cacheSize, boolean dropDBAfterTest) {
return new OakRepositoryFixture(OakFixture.getCompositeMongoStore(
OakFixture.OAK_COMPOSITE_MONGO_STORE,
- uri, cacheSize, dropDBAfterTest,
- mounts, pathsPerMount)
+ uri, cacheSize, dropDBAfterTest)
);
}
