This is an automated email from the ASF dual-hosted git repository.

stefanegli pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new fff3bfd65f OAK-8646 - Tests for detecting  changes from orphaned 
branch commits (#904)
fff3bfd65f is described below

commit fff3bfd65f536a8d9179ed309f8bef6d61fc62ec
Author: Ankita Agarwal <[email protected]>
AuthorDate: Mon Apr 24 13:43:39 2023 +0530

    OAK-8646 - Tests for detecting  changes from orphaned branch commits (#904)
    
    * OAK-8646 - Tests for detecting  changes from orphaned branch commits
    
    * OAK-8646 - Tests for detecting changes from orphaned branch commits
---
 .../oak/plugins/document/BranchCommitGCTest.java   | 122 +++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
new file mode 100644
index 0000000000..2aca59d7af
--- /dev/null
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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 org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.stats.Clock;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.Rule;
+import org.junit.Before;
+import org.junit.After;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static java.util.concurrent.TimeUnit.HOURS;
+import static 
org.apache.jackrabbit.oak.plugins.document.TestUtils.persistToBranch;
+
+public class BranchCommitGCTest {
+
+    @Rule
+    public DocumentMKBuilderProvider builderProvider = new 
DocumentMKBuilderProvider();
+    private Clock clock;
+    private DocumentNodeStore store;
+    private VersionGarbageCollector gc;
+
+    @Before
+    public void setUp() throws InterruptedException {
+        clock = new Clock.Virtual();
+        clock.waitUntil(System.currentTimeMillis());
+        Revision.setClock(clock);
+        store = builderProvider.newBuilder()
+                .clock(clock)
+                .setLeaseCheckMode(LeaseCheckMode.DISABLED)
+                .setAsyncDelay(0)
+                .getNodeStore();
+        gc = store.getVersionGarbageCollector();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (store != null) {
+            store.dispose();
+        }
+        Revision.resetClockToDefault();
+    }
+
+    @Ignore
+    @Test
+    public void orphanedBranchCommitDetect() throws Exception {
+
+        NodeBuilder b1 = store.getRoot().builder();
+        b1.child("a");
+        b1.child("b");
+        persistToBranch(b1);
+
+        // b1 must see 'a' and 'b'
+        assertTrue(b1.hasChildNode("a"));
+        assertTrue(b1.hasChildNode("b"));
+
+        store.runBackgroundOperations();
+
+        // wait two hours
+        clock.waitUntil(clock.getTime() + HOURS.toMillis(2));
+        // clean everything older than one hours
+        VersionGarbageCollector.VersionGCStats stats= gc.gc(1, HOURS);
+
+        //This will fail as of now but will pass once BranchCommit GC code is 
merged.
+        assertEquals(1, stats.deletedDocGCCount);
+    }
+
+    @Ignore
+    @Test
+    public void orphanedModifiedBranchCommitDetect() throws Exception {
+
+        NodeBuilder b = store.getRoot().builder();
+        b.child("foo");
+        b.child("test");
+        persistToBranch(b);
+
+        // b must see 'foo' and 'test'
+        assertTrue(b.hasChildNode("foo"));
+        assertTrue(b.hasChildNode("test"));
+
+        merge(b);
+
+        b = store.getRoot().builder();
+        b.child("test").remove();
+        b.getChildNode("foo").child("childfoo");
+        persistToBranch(b);
+        store.runBackgroundOperations();
+
+        // wait two hours
+        clock.waitUntil(clock.getTime() + HOURS.toMillis(2));
+        // clean everything older than one hours
+        VersionGarbageCollector.VersionGCStats stats= gc.gc(1, HOURS);
+
+        //This will fail as of now but will pass once BranchCommit GC code is 
merged.
+        assertEquals(1, stats.deletedDocGCCount);
+    }
+
+    private void merge(NodeBuilder builder)
+            throws Exception {
+        store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+    }
+
+}

Reply via email to