svn commit: r1866382 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java

[mr...@apache.org]

Author: mreutegg
Date: Wed Sep  4 12:34:47 2019
New Revision: 1866382

URL: http://svn.apache.org/viewvc?rev=1866382&view=rev
Log:
OAK-8591: Conflict exception on commit

Add ignored test

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java?rev=1866382&r1=1866381&r2=1866382&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java Wed Sep  4 12:34:47 2019
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.oak.plugins.document;
 
+import java.lang.ref.ReferenceQueue;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -23,6 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
@@ -39,6 +43,7 @@ import org.apache.jackrabbit.oak.spi.com
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static com.google.common.collect.Maps.newLinkedHashMap;
@@ -50,7 +55,9 @@ import static org.apache.jackrabbit.oak.
 import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getIdFromPath;
 import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getRootDocument;
 import static org.hamcrest.CoreMatchers.everyItem;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -472,6 +479,68 @@ public class NodeDocumentTest {
         ns.dispose();
     }
 
+    @Ignore
+    @Test
+    public void getNewestRevisionAfterGC() throws Exception {
+        getNewestRevisionAfterGC(false);
+    }
+
+    @Ignore
+    @Test
+    public void getNewestRevisionAfterGCWithBranchCommit() throws Exception {
+        getNewestRevisionAfterGC(true);
+    }
+
+    private void getNewestRevisionAfterGC(boolean withBranch) throws Exception {
+        DocumentStore store = new MemoryDocumentStore();
+        DocumentNodeStore ns = createTestStore(store, 1, 0);
+        NodeBuilder builder = ns.getRoot().builder();
+        builder.child("foo");
+        builder.child("bar").child("test");
+        merge(ns, builder);
+        // remember the revision
+        Revision r = ns.getHeadRevision().getRevision(1);
+        // perform changes that move the commit information
+        // to split documents
+        for (int i = 0; i < 100; i++) {
+            builder = ns.getRoot().builder();
+            builder.setProperty("p", "v-" + i);
+            merge(ns, builder);
+        }
+        ns.runBackgroundOperations();
+        String rootId = Utils.getIdFromPath(Path.ROOT);
+        NodeDocument rootDoc = store.find(NODES, rootId);
+        assertNotNull(rootDoc);
+        assertThat(rootDoc.getPreviousRanges().keySet(), not(empty()));
+
+        // trigger revision gc until split doc is removed
+        while (!rootDoc.getPreviousRanges().keySet().isEmpty()) {
+            ns.getVersionGarbageCollector().gc(1, TimeUnit.MILLISECONDS);
+            rootDoc = store.find(NODES, rootId);
+            assertNotNull(rootDoc);
+        }
+
+        ns.dispose();
+
+        // start fresh
+        ns = createTestStore(store, 1, 0, 0);
+        String id = Utils.getIdFromPath(Path.fromString("/bar/test"));
+        NodeDocument doc = store.find(NODES, id);
+        assertNotNull(doc);
+
+        RevisionVector baseRev = ns.getHeadRevision();
+        Revision change = ns.newRevision();
+        Branch branch = null;
+        if (withBranch) {
+            SortedSet<Revision> branchCommits = new TreeSet<>(StableRevisionComparator.REVERSE);
+            branchCommits.add(change);
+            branch = new Branch(branchCommits, baseRev, new ReferenceQueue<>(), null);
+            baseRev = baseRev.asBranchRevision(1);
+        }
+        Revision rev = doc.getNewestRevision(ns, baseRev, change, branch, new HashSet<>());
+        assertEquals(r, rev);
+    }
+
     @Test
     public void getChanges() throws Exception {
         final int numChanges = 200;