You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2013/10/16 15:36:59 UTC
svn commit: r1532759 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
test/java/org/apache/jackrabbit/oak/plugins/mongomk/DocumentSplitTest.java
Author: mreutegg
Date: Wed Oct 16 13:36:59 2013
New Revision: 1532759
URL: http://svn.apache.org/r1532759
Log:
OAK-1102: Isolate MicroKernel specific code in MongoMK
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/DocumentSplitTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java?rev=1532759&r1=1532758&r2=1532759&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMK.java Wed Oct 16 13:36:59 2013
@@ -121,6 +121,10 @@ public class MongoMK implements MicroKer
nodeStore.backgroundWrite();
}
+ void runBackgroundOperations() {
+ nodeStore.runBackgroundOperations();
+ }
+
MongoNodeStore getNodeStore() {
return nodeStore;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/DocumentSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/DocumentSplitTest.java?rev=1532759&r1=1532758&r2=1532759&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/DocumentSplitTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/DocumentSplitTest.java Wed Oct 16 13:36:59 2013
@@ -49,7 +49,7 @@ public class DocumentSplitTest extends B
revisions.add(Revision.fromString(mk.commit("/", "+\"foo/node-" + revisions.size() + "\":{}" +
"+\"bar/node-" + revisions.size() + "\":{}", null, null)));
}
- ns.runBackgroundOperations();
+ mk.runBackgroundOperations();
String head = mk.getHeadRevision();
doc = store.find(Collection.NODES, Utils.getIdFromPath("/"));
assertNotNull(doc);
@@ -85,7 +85,7 @@ public class DocumentSplitTest extends B
}
create = !create;
}
- ns.runBackgroundOperations();
+ mk.runBackgroundOperations();
String head = mk.getHeadRevision();
doc = store.find(Collection.NODES, Utils.getIdFromPath("/foo"));
assertNotNull(doc);
@@ -108,7 +108,6 @@ public class DocumentSplitTest extends B
@Test
public void splitCommitRoot() throws Exception {
DocumentStore store = mk.getDocumentStore();
- MongoNodeStore ns = mk.getNodeStore();
mk.commit("/", "+\"foo\":{}+\"bar\":{}", null, null);
NodeDocument doc = store.find(Collection.NODES, Utils.getIdFromPath("/foo"));
assertNotNull(doc);
@@ -119,7 +118,7 @@ public class DocumentSplitTest extends B
commitRoots.add(Revision.fromString(mk.commit("/", "^\"foo/prop\":" +
commitRoots.size() + "^\"bar/prop\":" + commitRoots.size(), null, null)));
}
- ns.runBackgroundOperations();
+ mk.runBackgroundOperations();
doc = store.find(Collection.NODES, Utils.getIdFromPath("/foo"));
assertNotNull(doc);
Map<Revision, String> commits = doc.getLocalCommitRoot();
@@ -143,7 +142,7 @@ public class DocumentSplitTest extends B
revisions.add(Revision.fromString(mk.commit("/", "^\"foo/prop\":" +
revisions.size(), null, null)));
}
- ns.runBackgroundOperations();
+ mk.runBackgroundOperations();
doc = store.find(Collection.NODES, Utils.getIdFromPath("/foo"));
assertNotNull(doc);
Map<Revision, String> localRevs = doc.getLocalRevisions();
@@ -169,7 +168,6 @@ public class DocumentSplitTest extends B
builder = new MongoMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
MongoMK mk1 = builder.setClusterId(1).open();
- MongoNodeStore ns1 = mk1.getNodeStore();
mk1.commit("/", "+\"test\":{\"prop1\":0}", null, null);
// make sure the new node is visible to other MongoMK instances
@@ -178,11 +176,9 @@ public class DocumentSplitTest extends B
builder = new MongoMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
MongoMK mk2 = builder.setClusterId(2).open();
- MongoNodeStore ns2 = mk2.getNodeStore();
builder = new MongoMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
MongoMK mk3 = builder.setClusterId(3).open();
- MongoNodeStore ns3 = mk3.getNodeStore();
for (int i = 0; i < NodeDocument.REVISIONS_SPLIT_OFF_SIZE; i++) {
mk1.commit("/", "^\"test/prop1\":" + i, null, null);
@@ -190,9 +186,9 @@ public class DocumentSplitTest extends B
mk3.commit("/", "^\"test/prop3\":" + i, null, null);
}
- ns1.runBackgroundOperations();
- ns2.runBackgroundOperations();
- ns3.runBackgroundOperations();
+ mk1.runBackgroundOperations();
+ mk2.runBackgroundOperations();
+ mk3.runBackgroundOperations();
NodeDocument doc = ds.find(Collection.NODES, Utils.getIdFromPath("/test"));
assertNotNull(doc);