svn commit: r1749442 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java

[chetanm]

Author: chetanm
Date: Tue Jun 21 06:21:16 2016
New Revision: 1749442

URL: http://svn.apache.org/viewvc?rev=1749442&view=rev
Log:
OAK-4180 - Use another NodeStore as a local cache for a remote Document store

Break from loop early if lastRev of intermediate node is less than requested 
lastRev

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java?rev=1749442&r1=1749441&r2=1749442&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java
 Tue Jun 21 06:21:16 2016
@@ -122,22 +122,24 @@ class SecondaryStoreCache implements Doc
         NodeState state = root;
 
         for (String name : PathUtils.elements(path)) {
-            if (state.exists()){
-                if (lastRev.compareTo(asDocState(state).getLastRevision()) > 
0){
-                    return null;
-                }
-            }
             state = state.getChildNode(name);
-        }
 
-        if (state.exists()) {
-            AbstractDocumentNodeState docState = asDocState(state);
-            if (lastRev.equals(docState.getLastRevision())) {
-                headRevMatched.mark();
-                return docState;
+            if (!state.exists()){
+                return null;
+            }
+
+            //requested lastRev is > current node lastRev then no need to 
check further
+            if (lastRev.compareTo(asDocState(state).getLastRevision()) > 0){
+                return null;
             }
         }
 
+        AbstractDocumentNodeState docState = asDocState(state);
+        if (lastRev.equals(docState.getLastRevision())) {
+            headRevMatched.mark();
+            return docState;
+        }
+
         return null;
     }