Author: mreutegg
Date: Tue Oct 7 09:43:16 2014
New Revision: 1629840
URL: http://svn.apache.org/r1629840
Log:
OAK-2144: Intermittent Node not found at given revision with DocumentNodeStore
Fixed typos and added checks whether nodes still exist after revision
comparator purge
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java?rev=1629840&r1=1629839&r2=1629840&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterRevisionComparisonTest.java
Tue Oct 7 09:43:16 2014
@@ -35,6 +35,8 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
+import static org.junit.Assert.assertTrue;
+
public class ClusterRevisionComparisonTest {
private MemoryDocumentStore ds = new MemoryDocumentStore();
private MemoryBlobStore bs = new MemoryBlobStore();
@@ -71,7 +73,7 @@ public class ClusterRevisionComparisonTe
runBgOps(c2);
//6. Time T4. Read the changes /a/c2 by c2 created at T1.
- // Would be considered seen ar T4 i.e. rT1-C2 -> rT4-C1
+ // Would be considered seen at T4 i.e. rT1-C2 -> rT4-C1
// Now from C1 view rT1-C2 > rT2-C3 even though T1 < T2
//so effectively changes done in future in C3 in absolute time terms
//is considered to be seen in past by C1
@@ -87,10 +89,14 @@ public class ClusterRevisionComparisonTe
c1.invalidateNodeCache("/a/c2" ,
((DocumentNodeState)c1ns1.getChildNode("a")).getLastRevision());
c1.invalidateNodeCache("/a/c3" ,
((DocumentNodeState)c1ns1.getChildNode("a")).getLastRevision());
- //Revision compartor purge by moving in future
+ //Revision comparator purge by moving in future
clock.waitUntil(clock.getTime() +
DocumentNodeStore.REMEMBER_REVISION_ORDER_MILLIS * 2);
runBgOps(c1);
+ NodeState a = c1ns1.getChildNode("a");
+ assertTrue("/a/c2 disappeared", a.hasChildNode("c2"));
+ assertTrue("/a/c3 disappeared", a.hasChildNode("c3"));
+
DocumentNodeState c1ns2 = c1.getRoot();
//Trigger a diff. With OAK-2144 an exception would be thrown as diff
traverses
