svn commit: r1851253 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/ test/java/org/apache/jackrabbit/oak/plugins/document/

[mreutegg]

Author: mreutegg
Date: Mon Jan 14 14:01:43 2019
New Revision: 1851253

URL: http://svn.apache.org/viewvc?rev=1851253&view=rev
Log:
OAK-7984: Batch update documents in commit rollback

Use batch DocumentStore.createOrUpdate() and enable test

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1851253&r1=1851252&r2=1851253&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
 Mon Jan 14 14:01:43 2019
@@ -477,13 +477,17 @@ public class Commit {
     private void rollback(List<UpdateOp> changed,
                           UpdateOp commitRoot) {
         DocumentStore store = nodeStore.getDocumentStore();
+        List<UpdateOp> reverseOps = new ArrayList<>();
         for (UpdateOp op : changed) {
             UpdateOp reverse = op.getReverseOperation();
             if (op.isNew()) {
                 NodeDocument.setDeletedOnce(reverse);
             }
-            store.findAndUpdate(NODES, reverse);
+            // do not create document if it doesn't exist
+            reverse.setNew(false);
+            reverseOps.add(reverse);
         }
+        store.createOrUpdate(NODES, reverseOps);
         removeCollisionMarker(commitRoot.getId());
     }
 

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java?rev=1851253&r1=1851252&r2=1851253&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
 Mon Jan 14 14:01:43 2019
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -39,7 +38,6 @@ public class BatchRollbackTest {
 
     private TestStore store = new TestStore();
 
-    @Ignore("OAK-7984")
     @Test
     public void batchRollback() throws Exception {
         DocumentNodeStore ns = builderProvider.newBuilder()

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1851253&r1=1851252&r2=1851253&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 Mon Jan 14 14:01:43 2019
@@ -319,7 +319,7 @@ public class DocumentNodeStoreTest {
                 .build();
         c.apply();
         // allow writer to continue
-        s.release();
+        s.release(10);
         writer.join();
         assertEquals("expected exception", 1, exceptions.size());