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 ch...@apache.org on 2016/06/21 06:19:41 UTC
svn commit: r1749434 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Author: chetanm
Date: Tue Jun 21 06:19:41 2016
New Revision: 1749434
URL: http://svn.apache.org/viewvc?rev=1749434&view=rev
Log:
OAK-4180 - Use another NodeStore as a local cache for a remote Document store
Perform lookup from secondary store first and then do a lookup on the cache
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1749434&r1=1749433&r2=1749434&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java Tue Jun 21 06:19:41 2016
@@ -875,17 +875,12 @@ public final class DocumentNodeStore
AbstractDocumentNodeState getNode(@Nonnull final String path,
@Nonnull final RevisionVector rootRevision,
@Nonnull final RevisionVector rev) {
- AbstractDocumentNodeState result = nodeCache.getIfPresent(new PathRev(path, rev));
- if (result == null){
- NodeStateCacheEntry entry = nodeStateCache.getDocumentNodeState(path, rootRevision, rev);
- if (entry.isMissing()){
- return null;
- } else if (entry.isFound()){
- return entry.getState();
- }
- } else {
- return result == missing
- || result.equals(missing) ? null : result;
+ //Check secondary cache first
+ NodeStateCacheEntry entry = nodeStateCache.getDocumentNodeState(path, rootRevision, rev);
+ if (entry.isMissing()){
+ return null;
+ } else if (entry.isFound()){
+ return entry.getState();
}
return getNode(path, rev);