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 2018/01/17 14:43:58 UTC

svn commit: r1821373 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java

Author: mreutegg
Date: Wed Jan 17 14:43:58 2018
New Revision: 1821373

URL: http://svn.apache.org/viewvc?rev=1821373&view=rev
Log:
OAK-7153: Avoid persistent cache read access when key is not cached

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java?rev=1821373&r1=1821372&r2=1821373&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java Wed Jan 17 14:43:58 2018
@@ -207,6 +207,13 @@ class NodeCache<K, V> implements Cache<K
         } else {
             return value;
         }
+
+        // do not bother the persistent cache if the
+        // key was excluded by configuration
+        if (!type.shouldCache(nodeStore, key)) {
+            return null;
+        }
+
         stats.markRequest();
 
         // it takes care of updating memCacheMetadata

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java?rev=1821373&r1=1821372&r2=1821373&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCacheTest.java Wed Jan 17 14:43:58 2018
@@ -47,7 +47,6 @@ import org.apache.jackrabbit.oak.stats.M
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.apache.jackrabbit.oak.stats.StatsOptions;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -149,7 +148,6 @@ public class NodeCacheTest {
     }
 
     // OAK-7153
-    @Ignore
     @Test
     public void persistentCacheAccessForIncludedPathOnly() throws Exception {
         PathFilter pf = new PathFilter(singletonList("/a"), emptyList());