svn commit: r1466869 - in /jackrabbit/oak/trunk/oak-mongomk/src: main/java/org/apache/jackrabbit/mongomk/MongoMK.java test/java/org/apache/jackrabbit/mongomk/ClusterTest.java

[mreutegg]

Author: mreutegg
Date: Thu Apr 11 13:03:07 2013
New Revision: 1466869

URL: http://svn.apache.org/r1466869
Log:
OAK-619 Lock-free MongoMK implementation
- Use UpdateOp.setMapEntry() instead of set()
- Enable test

Modified:
    
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
    
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java

Modified: 
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java?rev=1466869&r1=1466868&r2=1466869&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
 Thu Apr 11 13:03:07 2013
@@ -1131,7 +1131,7 @@ public class MongoMK implements MicroKer
         Revision baseRevId = Revision.fromString(revisionId);
         while (baseRevId != null) {
             branchRevisions.add(baseRevId);
-            op.set(UpdateOp.REVISIONS + "." + baseRevId, "true");
+            op.setMapEntry(UpdateOp.REVISIONS, baseRevId.toString(), "true");
             baseRevId = branchCommits.get(baseRevId);
         }
         store.createOrUpdate(DocumentStore.Collection.NODES, op);

Modified: 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java?rev=1466869&r1=1466868&r2=1466869&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/ClusterTest.java
 Thu Apr 11 13:03:07 2013
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.mk.api.Micr
 import org.apache.jackrabbit.mk.blobs.MemoryBlobStore;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.mongodb.DB;
@@ -64,7 +63,6 @@ public class ClusterTest {
     }    
     
     @Test
-    @Ignore
     public void clusterBranchInVisibility() {
         MongoMK mk1 = createMK(0);
         mk1.commit("/", "+\"regular\": {}", null, null);