You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/12/16 12:20:12 UTC
svn commit: r1720335 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Author: mreutegg
Date: Wed Dec 16 11:20:12 2015
New Revision: 1720335
URL: http://svn.apache.org/viewvc?rev=1720335&view=rev
Log:
OAK-3798: NodeDocument.getNewestRevision() incorrect when there are previous documents
Add test (currently ignored)
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1720335&r1=1720334&r2=1720335&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Wed Dec 16 11:20:12 2015
@@ -348,6 +348,37 @@ public class DocumentNodeStoreTest {
ns2.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
+ // OAK-3798
+ @Ignore("OAK-3798")
+ @Test
+ public void getNewestRevision2() throws Exception {
+ DocumentStore docStore = new MemoryDocumentStore();
+ DocumentNodeStore ns1 = builderProvider.newBuilder()
+ .setDocumentStore(docStore).setAsyncDelay(0)
+ .setClusterId(1).getNodeStore();
+ ns1.getRoot();
+ Revision r1 = ns1.getHeadRevision();
+ ns1.runBackgroundOperations();
+ DocumentNodeStore ns2 = builderProvider.newBuilder()
+ .setDocumentStore(docStore).setAsyncDelay(0)
+ .setClusterId(2).getNodeStore();
+ ns2.getRoot();
+
+ NodeBuilder b1 = ns1.getRoot().builder();
+ for (int i = 0; i < NodeDocument.NUM_REVS_THRESHOLD; i++) {
+ b1.setProperty("p", String.valueOf(i));
+ ns1.merge(b1, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ }
+ ns1.runBackgroundOperations();
+
+ NodeDocument doc = docStore.find(NODES, Utils.getIdFromPath("/"));
+ assertNotNull(doc);
+ Revision newest = doc.getNewestRevision(ns2, ns2.getHeadRevision(),
+ Revision.newRevision(ns2.getClusterId()),
+ null, Sets.<Revision>newHashSet());
+ assertEquals(r1, newest);
+ }
+
@Test
public void commitHookChangesOnBranch() throws Exception {
final int NUM_NODES = DocumentRootBuilder.UPDATE_LIMIT / 2;