Author: mreutegg
Date: Mon Jan 14 10:03:44 2019
New Revision: 1851236
URL: http://svn.apache.org/viewvc?rev=1851236&view=rev
Log:
OAK-7984: Batch update documents in commit rollback
Add ignored test
Added:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
Added:
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=1851236&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
(added)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
Mon Jan 14 10:03:44 2019
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.document;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+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;
+
+import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import static
org.apache.jackrabbit.oak.plugins.document.TestUtils.isFinalCommitRootUpdate;
+import static org.apache.jackrabbit.oak.plugins.document.TestUtils.merge;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+public class BatchRollbackTest {
+
+ @Rule
+ public DocumentMKBuilderProvider builderProvider = new
DocumentMKBuilderProvider();
+
+ private TestStore store = new TestStore();
+
+ @Ignore("OAK-7984")
+ @Test
+ public void batchRollback() throws Exception {
+ DocumentNodeStore ns = builderProvider.newBuilder()
+ .setDocumentStore(store)
+ .setAsyncDelay(0).build();
+ ns.setMaxBackOffMillis(0);
+
+ // prepare some test nodes
+ NodeBuilder builder = ns.getRoot().builder();
+ for (int i = 0; i < 10; i++) {
+ builder.child("node-" + i);
+ }
+ merge(ns, builder);
+
+ // perform an merge that fails
+ builder = ns.getRoot().builder();
+ for (int i = 0; i < 10; i++) {
+ builder.child("node-" + i).child("test");
+ }
+ store.resetCounters();
+ store.failCommitOnce.set(true);
+ try {
+ merge(ns, builder);
+ fail("must fail with CommitFailedException");
+ } catch (CommitFailedException e) {
+ // expected
+ }
+ assertThat(store.getNumCreateOrUpdateCalls(NODES), lessThan(4));
+ }
+
+ private static class TestStore extends CountingDocumentStore {
+
+ final AtomicBoolean failCommitOnce = new AtomicBoolean();
+
+ TestStore() {
+ super(new MemoryDocumentStore());
+ }
+
+ @Override
+ public <T extends Document> T findAndUpdate(Collection<T> collection,
+ UpdateOp update) {
+ if (collection == Collection.NODES
+ && isFinalCommitRootUpdate(update)
+ && failCommitOnce.compareAndSet(true, false)) {
+ throw new DocumentStoreException("commit failed");
+ }
+ return super.findAndUpdate(collection, update);
+ }
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BatchRollbackTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java?rev=1851236&r1=1851235&r2=1851236&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
Mon Jan 14 10:03:44 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;
+ }
}
