Author: mreutegg
Date: Thu Jan 31 10:00:40 2019
New Revision: 1852580
URL: http://svn.apache.org/viewvc?rev=1852580&view=rev
Log:
OAK-7984: Batch update documents in commit rollback
Merge revision 1851236 and 1851253 from trunk
Added:
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
- copied, changed from r1851236,
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 31 10:00:40 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1851451,1852052,1852084,1852451,1852492-1852493
+/jackrabbit/oak/trunk:1851236,1851253,1851451,1852052,1852084,1852451,1852492-1852493
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1852580&r1=1852579&r2=1852580&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Thu Jan 31 10:00:40 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());
}
Copied:
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
(from r1851236,
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/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java?p2=jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java&p1=jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java&r1=1851236&r2=1852580&rev=1852580&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
Thu Jan 31 10:00:40 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/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1852580&r1=1852579&r2=1852580&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Thu Jan 31 10:00:40 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());
Modified:
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java?rev=1852580&r1=1852579&r2=1852580&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
(original)
+++
jackrabbit/oak/branches/1.10/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
Thu Jan 31 10:00:40 2019
@@ -110,4 +110,18 @@ public class TestUtils {
}
fail("Not of type DocumentRootBuilder: " +
builder.getClass().getName());
}
+
+ public static boolean isFinalCommitRootUpdate(UpdateOp update) {
+ boolean finalUpdate = true;
+ for (Map.Entry<UpdateOp.Key, UpdateOp.Operation> op :
update.getChanges().entrySet()) {
+ String name = op.getKey().getName();
+ if (NodeDocument.isRevisionsEntry(name)
+ || NodeDocument.MODIFIED_IN_SECS.equals(name)) {
+ continue;
+ }
+ finalUpdate = false;
+ break;
+ }
+ return finalUpdate;
+ }
}
