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 re...@apache.org on 2016/06/22 12:46:11 UTC
svn commit: r1749662 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Author: reschke
Date: Wed Jun 22 12:46:11 2016
New Revision: 1749662
URL: http://svn.apache.org/viewvc?rev=1749662&view=rev
Log:
OAK-4495: RDBDocumentStore: consistent handling of invalidate methods
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1749662&r1=1749661&r2=1749662&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Wed Jun 22 12:46:11 2016
@@ -64,6 +64,7 @@ import javax.sql.DataSource;
import com.google.common.base.Function;
import com.google.common.base.Stopwatch;
import org.apache.jackrabbit.oak.cache.CacheStats;
+import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
@@ -492,16 +493,18 @@ public class RDBDocumentStore implements
@Override
public CacheInvalidationStats invalidateCache() {
- for (NodeDocument nd : nodesCache.values()) {
- nd.markUpToDate(0);
+ for (CacheValue key : nodesCache.keys()) {
+ invalidateCache(Collection.NODES, key.toString());
}
return null;
}
@Override
public CacheInvalidationStats invalidateCache(Iterable<String> keys) {
- //TODO: optimize me
- return invalidateCache();
+ for (String key : keys) {
+ invalidateCache(Collection.NODES, key);
+ }
+ return null;
}
@Override