Author: tomekr
Date: Wed Nov 23 09:27:03 2016
New Revision: 1770936
URL: http://svn.apache.org/viewvc?rev=1770936&view=rev
Log:
OAK-5138: NodeCache.getIfPresent() may result in writing to persistent cache
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/MultiGenerationMap.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/MultiGenerationMap.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/MultiGenerationMap.java?rev=1770936&r1=1770935&r2=1770936&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/MultiGenerationMap.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/MultiGenerationMap.java
Wed Nov 23 09:27:03 2016
@@ -55,15 +55,22 @@ public class MultiGenerationMap<K, V> im
@SuppressWarnings("unchecked")
@Override
public V get(Object key) {
+ ValueWithGenerationInfo<V> value = readValue(key);
+ if (value == null) {
+ return null;
+ } else if (!value.isCurrentGeneration()) {
+ put((K) key, value.value);
+ }
+ return value.getValue();
+ }
+
+ ValueWithGenerationInfo<V> readValue(Object key) {
for (int generation : read.descendingKeySet()) {
CacheMap<K, V> m = read.get(generation);
if (m != null) {
V value = m.get(key);
if (value != null) {
- if (m != write) {
- put((K) key, value);
- }
- return value;
+ return new ValueWithGenerationInfo<V>(value, m == write);
}
}
}
@@ -128,4 +135,23 @@ public class MultiGenerationMap<K, V> im
throw new UnsupportedOperationException();
}
+ static class ValueWithGenerationInfo<V> {
+
+ private final V value;
+
+ private final boolean isCurrentGeneration;
+
+ private ValueWithGenerationInfo(V value, boolean isCurrentGeneration) {
+ this.value = value;
+ this.isCurrentGeneration = isCurrentGeneration;
+ }
+
+ V getValue() {
+ return value;
+ }
+
+ boolean isCurrentGeneration() {
+ return isCurrentGeneration;
+ }
+ }
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java?rev=1770936&r1=1770935&r2=1770936&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
Wed Nov 23 09:27:03 2016
@@ -34,8 +34,6 @@ import java.util.concurrent.ExecutionExc
import javax.annotation.Nullable;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import
org.apache.jackrabbit.oak.plugins.document.persistentCache.PersistentCache.GenerationCache;
@@ -129,13 +127,40 @@ class NodeCache<K, V> implements Cache<K
}
private V readIfPresent(K key) {
+ return async ? asyncReadIfPresent(key) : syncReadIfPresent(key);
+ }
+
+ private V syncReadIfPresent(K key) {
cache.switchGenerationIfNeeded();
TimerStats.Context ctx = stats.startReadTimer();
V v = map.get(key);
ctx.stop();
+ if (v != null) {
+ memCacheMetadata.putFromPersistenceAndIncrement(key);
+ }
return v;
}
+ private V asyncReadIfPresent(K key) {
+ TimerStats.Context ctx = stats.startReadTimer();
+ try {
+ MultiGenerationMap.ValueWithGenerationInfo<V> v =
map.readValue(key);
+ if (v == null) {
+ return null;
+ }
+ if (v.isCurrentGeneration() && !cache.needSwitch()) {
+ // don't persist again on eviction
+ memCacheMetadata.putFromPersistenceAndIncrement(key);
+ } else {
+ // persist again during eviction
+ memCacheMetadata.increment(key);
+ }
+ return v.getValue();
+ } finally {
+ ctx.stop();
+ }
+ }
+
private void broadcast(final K key, final V value) {
cache.broadcast(type, new Function<WriteBuffer, Void>() {
@Override
@@ -184,9 +209,9 @@ class NodeCache<K, V> implements Cache<K
}
stats.markRequest();
+ // it takes care of updating memCacheMetadata
value = readIfPresent((K) key);
if (value != null) {
- memCacheMetadata.putFromPersistenceAndIncrement((K) key);
memCache.put((K) key, value);
stats.markHit();
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java?rev=1770936&r1=1770935&r2=1770936&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/PersistentCache.java
Wed Nov 23 09:27:03 2016
@@ -493,7 +493,7 @@ public class PersistentCache implements
}
}
- private boolean needSwitch() {
+ boolean needSwitch() {
long size = writeStore.getFileSize();
if (size / 1024 / 1024 <= maxSizeMB) {
return false;
