Author: jukka
Date: Fri Feb 28 00:50:00 2014
New Revision: 1572794
URL: http://svn.apache.org/r1572794
Log:
OAK-593: Segment-based MK
OAK-1283: TCK tests slow on SegmentMK+Mongo
Drop the currently unused MongoStore to make refactorings easier.
We can resurrect the MongoDB backend for the SegmentMK later on
if a need arises.
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/mongo/MongoJournal.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/mongo/MongoStore.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakSegmentMKRepositoryStub.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
jackrabbit/oak/trunk/oak-run/README.md
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-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java?rev=1572794&r1=1572793&r2=1572794&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
Fri Feb 28 00:50:00 2014
@@ -25,7 +25,6 @@ import java.util.Properties;
import org.apache.jackrabbit.oak.jcr.OakDocumentRDBRepositoryStub;
import org.apache.jackrabbit.oak.jcr.OakMongoNSRepositoryStub;
-import org.apache.jackrabbit.oak.jcr.OakSegmentMKRepositoryStub;
import org.apache.jackrabbit.oak.jcr.OakTarMKRepositoryStub;
import org.apache.jackrabbit.test.RepositoryHelper;
import org.apache.jackrabbit.test.RepositoryHelperPool;
@@ -49,9 +48,6 @@ public abstract class TCKBase extends Te
public TCKBase(String name) {
super(name);
Setup.wrap(this, OakTarMKRepositoryStub.class.getName());
- if (OakSegmentMKRepositoryStub.isAvailable()) {
- //Setup.wrap(this, OakSegmentMKRepositoryStub.class.getName());
- }
if (OakMongoNSRepositoryStub.isMongoDBAvailable()) {
Setup.wrap(this, OakMongoNSRepositoryStub.class.getName());
}
Modified: jackrabbit/oak/trunk/oak-run/README.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/README.md?rev=1572794&r1=1572793&r2=1572794&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/README.md (original)
+++ jackrabbit/oak/trunk/oak-run/README.md Fri Feb 28 00:50:00 2014
@@ -112,8 +112,7 @@ Finally the benchmark runner supports th
| Oak-Memory | Oak with the default MK using in-memory storage |
| Oak-Default | Oak with the default MK using embedded H2 database |
| Oak-Mongo | Oak with the new MongoMK |
-| Oak-Segment | Oak with MongoDB-based SegmentMK |
-| Oak-Tar | Oak with Tar file -based SegmentMK |
+| Oak-Tar | Oak with the TarMK |
Once started, the benchmark runner will execute each listed test case
against all the listed repository fixtures. After starting up the
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=1572794&r1=1572793&r2=1572794&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
Fri Feb 28 00:50:00 2014
@@ -93,8 +93,6 @@ public class BenchmarkRunner {
host.value(options), port.value(options),
dbName.value(options), dropDBAfterTest.value(options),
cacheSize * MB),
- OakRepositoryFixture.getSegment(
- host.value(options), port.value(options), cacheSize),
OakRepositoryFixture.getTar(
base.value(options), 256, cacheSize,
mmap.value(options))
};
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=1572794&r1=1572793&r2=1572794&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
Fri Feb 28 00:50:00 2014
@@ -37,9 +37,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
-import org.apache.jackrabbit.oak.plugins.segment.mongo.MongoStore;
-
-import com.mongodb.MongoClient;
public abstract class OakRepositoryFixture implements RepositoryFixture {
@@ -182,35 +179,6 @@ public abstract class OakRepositoryFixtu
};
}
- public static RepositoryFixture getSegment(
- final String host, final int port, final int cacheSizeMB) {
- return new OakRepositoryFixture("Oak-Segment") {
- private SegmentStore[] stores;
- private MongoClient mongo;
- @Override
- protected Repository[] internalSetUpCluster(int n) throws
Exception {
- Repository[] cluster = new Repository[n];
- stores = new SegmentStore[cluster.length];
- mongo = new MongoClient(host, port);
- for (int i = 0; i < cluster.length; i++) {
- stores[i] = new MongoStore(mongo.getDB(unique),
cacheSizeMB);
- Oak oak = new Oak(new SegmentNodeStore(stores[i]));
- cluster[i] = new Jcr(oak).createRepository();
- }
- return cluster;
- }
- @Override
- public void tearDownCluster() {
- super.tearDownCluster();
- for (SegmentStore store : stores) {
- store.close();
- }
- mongo.getDB(unique).dropDatabase();
- mongo.close();
- }
- };
- }
-
public static RepositoryFixture getTar(
final File base, final int maxFileSizeMB, final int cacheSizeMB,
final boolean memoryMapping) {
