svn commit: r1703428 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

[mreutegg]

Author: mreutegg
Date: Wed Sep 16 15:44:41 2015
New Revision: 1703428

URL: http://svn.apache.org/r1703428
Log:
OAK-3411: Inconsistent read on DocumentNodeStore startup

Revert the OAK-2929 fix.

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1703428&r1=1703427&r2=1703428&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
 Wed Sep 16 15:44:41 2015
@@ -37,6 +37,7 @@ import javax.annotation.Nullable;
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Queues;
 import org.apache.jackrabbit.oak.cache.CacheValue;
@@ -57,7 +58,6 @@ import com.google.common.collect.Sets;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.transform;
-import static java.util.Collections.reverseOrder;
 import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
 import static 
org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator.REVERSE;
 import static org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
@@ -737,11 +737,11 @@ public final class NodeDocument extends
 
         Revision newestRev = null;
         // check local commits first
-        Comparator<Revision> comp = 
reverseOrder(context.getRevisionComparator());
-        SortedSet<Revision> revisions = Sets.newTreeSet(comp);
-        revisions.addAll(getLocalRevisions().keySet());
-        revisions.addAll(getLocalCommitRoot().keySet());
-        Iterator<Revision> it = filter(revisions, predicate).iterator();
+        SortedMap<Revision, String> revisions = getLocalRevisions();
+        SortedMap<Revision, String> commitRoots = getLocalCommitRoot();
+        Iterator<Revision> it = filter(Iterables.mergeSorted(
+                ImmutableList.of(revisions.keySet(), commitRoots.keySet()),
+                revisions.comparator()), predicate).iterator();
         if (it.hasNext()) {
             newestRev = it.next();
         } else {

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=1703428&r1=1703427&r2=1703428&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 Sep 16 15:44:41 2015
@@ -1097,6 +1097,7 @@ public class DocumentNodeStoreTest {
     }
 
     // OAK-2929
+    @Ignore
     @Test
     public void conflictDetectionWithClockDifference() throws Exception {
         MemoryDocumentStore store = new MemoryDocumentStore();
@@ -1154,6 +1155,7 @@ public class DocumentNodeStoreTest {
     }
 
     // OAK-2929
+    @Ignore
     @Test
     public void parentWithUnseenChildrenMustNotBeDeleted() throws Exception {
         final MemoryDocumentStore docStore = new MemoryDocumentStore();
@@ -1316,7 +1318,12 @@ public class DocumentNodeStoreTest {
         //root would hold reference to store2 root state after initial repo 
initialization
         root = store2.getRoot();
 
-        //The hidden node and children should be creatable across cluster 
concurrently
+        //The hidden node itself should be creatable across cluster 
concurrently
+        builder = root.builder();
+        builder.child(":dynHidden");
+        merge(store2, builder);
+
+        //Children of hidden node should be creatable across cluster 
concurrently
         builder = root.builder();
         builder.child(":hidden").child("b");
         builder.child(":dynHidden").child("c");