Author: chetanm
Date: Mon Jun 15 14:47:12 2015
New Revision: 1685590
URL: http://svn.apache.org/r1685590
Log:
OAK-2829 - Comparing node states for external changes is too slow
Applying patch from Stefan Egli
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java?rev=1685590&r1=1685589&r2=1685590&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
Mon Jun 15 14:47:12 2015
@@ -231,8 +231,8 @@ public final class JournalEntry extends
}
long getRevisionTimestamp() {
- final String[] parts = getId().split("_");
- return Long.parseLong(parts[1]);
+ final String[] parts = getId().split("-");
+ return Long.parseLong(parts[1], 16);
}
void modified(String path) {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java?rev=1685590&r1=1685589&r2=1685590&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
Mon Jun 15 14:47:12 2015
@@ -27,7 +27,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
@@ -40,6 +39,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
+import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -180,6 +180,42 @@ public class JournalTest {
}
+ @Test
+ public void largeCleanupTest() throws Exception {
+ // create more than DELETE_BATCH_SIZE of entries and clean them up
+ // should make sure to loop in JournalGarbageCollector.gc such
+ // that it would find issue described here:
+ //
https://issues.apache.org/jira/browse/OAK-2829?focusedCommentId=14585733&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14585733
+
+ doLargeCleanupTest(0, 100);
+ doLargeCleanupTest(200, 1000);// using offset as to not make sure to
always create new entries
+ doLargeCleanupTest(2000, 10000);
+ doLargeCleanupTest(20000, 30000); // using 'size' much larger than 30k
will be tremendously slow due to ordered node
+ }
+
+ private void doLargeCleanupTest(int offset, int size) throws Exception {
+ Clock clock = new Clock.Virtual();
+ DocumentMK mk1 = createMK(0 /* clusterId: 0 => uses clusterNodes
collection */, 0);
+ DocumentNodeStore ns1 = mk1.getNodeStore();
+ // make sure we're visible and marked as active
+ ns1.renewClusterIdLease();
+ JournalGarbageCollector gc = new JournalGarbageCollector(ns1);
+ clock.getTimeIncreasing();
+ clock.getTimeIncreasing();
+ gc.gc(0, TimeUnit.MILLISECONDS); // cleanup everything that might
still be there
+
+ // create entries as parametrized:
+ for(int i=offset; i<size+offset; i++) {
+ mk1.commit("/", "+\"regular"+i+"\": {}", null, null);
+ // always run background ops to 'flush' the change
+ // into the journal:
+ ns1.runBackgroundOperations();
+ }
+ Thread.sleep(100); // sleep 100millis
+ assertEquals(size, gc.gc(0, TimeUnit.MILLISECONDS)); // should now be
able to clean up everything
+
+ }
+
@Test
public void cleanupTest() throws Exception {
DocumentMK mk1 = createMK(0 /* clusterId: 0 => uses clusterNodes
collection */, 0);
