Author: alexparvulescu Date: Thu Nov 14 17:06:52 2013 New Revision: 1541980
URL: http://svn.apache.org/r1541980 Log: OAK-1125 FileStore should inherit cache size setting Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java 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/fixture/OakRepositoryFixture.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1541980&r1=1541979&r2=1541980&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java Thu Nov 14 17:06:52 2013 @@ -61,7 +61,12 @@ public class FileStore extends AbstractS public FileStore(File directory, int maxFileSize, boolean memoryMapping) throws IOException { - super(DEFAULT_MEMORY_CACHE_SIZE); + this(directory, maxFileSize, DEFAULT_MEMORY_CACHE_SIZE, memoryMapping); + } + + public FileStore(File directory, int maxFileSize, int cacheSize, + boolean memoryMapping) throws IOException { + super(cacheSize); checkNotNull(directory).mkdirs(); this.directory = directory; this.maxFileSize = maxFileSize; 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=1541980&r1=1541979&r2=1541980&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 Thu Nov 14 17:06:52 2013 @@ -92,7 +92,7 @@ public class BenchmarkRunner { OakRepositoryFixture.getSegment( host.value(options), port.value(options), cacheSize * MB), OakRepositoryFixture.getTar( - base.value(options), 256 * 1024 * 1024, mmap.value(options)) + base.value(options), 256 * MB, cacheSize * MB, mmap.value(options)) }; Benchmark[] allBenchmarks = new Benchmark[] { new LoginTest(), Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1541980&r1=1541979&r2=1541980&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java Thu Nov 14 17:06:52 2013 @@ -190,7 +190,7 @@ public abstract class OakRepositoryFixtu public static RepositoryFixture getTar( final File base, - final int maxFileSize, final boolean memoryMapping) { + final int maxFileSize, final int cacheSize, final boolean memoryMapping) { return new OakRepositoryFixture("Oak-Tar") { private SegmentStore[] stores; @Override @@ -199,7 +199,7 @@ public abstract class OakRepositoryFixtu stores = new FileStore[cluster.length]; for (int i = 0; i < cluster.length; i++) { stores[i] = new FileStore( - new File(base, unique), maxFileSize, memoryMapping); + new File(base, unique), maxFileSize, cacheSize, memoryMapping); Oak oak = new Oak(new SegmentNodeStore(stores[i])); cluster[i] = new Jcr(oak).createRepository(); }
