Author: tomekr
Date: Mon Oct 31 15:12:45 2016
New Revision: 1767302
URL: http://svn.apache.org/viewvc?rev=1767302&view=rev
Log:
OAK-5035: Implement mini-benchmark for the PersistentCache
-use stat provider
-remove empty methods
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/PersistentCacheTest.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=1767302&r1=1767301&r2=1767302&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 Oct 31 15:12:45 2016
@@ -417,7 +417,7 @@ public class BenchmarkRunner {
new SyncExternalUsersTest(numberOfUsers.value(options),
numberOfGroups.value(options), expiration.value(options),
dynamicMembership.value(options), autoMembership.values(options),
batchSize.value(options)),
new HybridIndexTest(base.value(options), statsProvider),
new BundlingNodeTest(),
- new PersistentCacheTest()
+ new PersistentCacheTest(statsProvider)
};
Set<String> argset = Sets.newHashSet(nonOption.values(options));
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java?rev=1767302&r1=1767301&r2=1767302&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/PersistentCacheTest.java
Mon Oct 31 15:12:45 2016
@@ -39,23 +39,31 @@ public class PersistentCacheTest extends
private static final String CACHE_OPTIONS =
System.getProperty("cacheOptions", "size=100,+compact,-async");
+ private final StatisticsProvider statsProvider;
+
private Cache<PathRev, DocumentNodeState> nodesCache;
private DocumentNodeStore dns;
private AtomicLong timestamp = new AtomicLong(1000);
+ public PersistentCacheTest(StatisticsProvider statsProvider) {
+ this.statsProvider = statsProvider;
+ }
+
@Override
protected Repository[] createRepository(RepositoryFixture fixture) throws
Exception {
+ System.setProperty("PersistentCacheStats.rejectedPut", "true");
if (fixture instanceof OakRepositoryFixture) {
OakFixture oakFixture = ((OakRepositoryFixture)
fixture).getOakFixture();
if (oakFixture instanceof OakFixture.MongoFixture) {
OakFixture.MongoFixture mongoFixture =
(OakFixture.MongoFixture) oakFixture;
DocumentMK.Builder builder = mongoFixture.getBuilder(1);
+ builder.setStatisticsProvider(statsProvider);
builder.setPersistentCache("target/persistentCache,time," +
CACHE_OPTIONS);
dns = builder.getNodeStore();
nodesCache = DocumentNodeStoreHelper.getNodesCache(dns);
- Oak[] cluster = mongoFixture.setUpCluster(new
DocumentMK.Builder[] {builder}, StatisticsProvider.NOOP);
+ Oak[] cluster = mongoFixture.setUpCluster(new
DocumentMK.Builder[] {builder}, statsProvider);
return new Repository[] { new
Jcr(cluster[0]).createRepository() };
}
}
@@ -63,14 +71,6 @@ public class PersistentCacheTest extends
}
@Override
- protected void beforeSuite() throws Exception {
- }
-
- @Override
- protected void beforeTest() throws Exception {
- }
-
- @Override
protected void runTest() throws Exception {
for (int i = 0; i < ITEMS_TO_ADD; i++) {
PathRev key = PathRev.fromString("/" + timestamp.getAndIncrement()
+ "@" + new Revision(timestamp.getAndIncrement(), 0, 0));
@@ -78,8 +78,4 @@ public class PersistentCacheTest extends
nodesCache.getIfPresent(key); // read, so the entry is marked as
used
}
}
-
- @Override
- protected void afterTest() throws Exception {
- }
}
\ No newline at end of file
