svn commit: r1741633 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache: CacheChangesTracker.java NodeDocumentCache.java

[to...@apache.org]

Author: tomekr
Date: Fri Apr 29 14:04:47 2016
New Revision: 1741633

URL: http://svn.apache.org/viewvc?rev=1741633&view=rev
Log:
OAK-4112: Replace the query exclusive lock with a cache tracker

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTracker.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTracker.java?rev=1741633&r1=1741632&r2=1741633&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTracker.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTracker.java Fri Apr 29 14:04:47 2016
@@ -20,11 +20,15 @@ import com.google.common.base.Predicate;
 import com.google.common.hash.BloomFilter;
 import com.google.common.hash.Funnel;
 import com.google.common.hash.PrimitiveSink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class CacheChangesTracker {
 
+    private static final Logger LOG = LoggerFactory.getLogger(CacheChangesTracker.class);
+
     static final int ENTRIES_SCOPED = 1000;
 
     static final int ENTRIES_OPEN = 10000;
@@ -60,6 +64,14 @@ public class CacheChangesTracker {
 
     public void close() {
         changeTrackers.remove(this);
+
+        if (LOG.isDebugEnabled()) {
+            if (lazyBloomFilter.filter == null) {
+                LOG.debug("Disposing CacheChangesTracker for {}, no filter was needed", keyFilter);
+            } else {
+                LOG.debug("Disposing CacheChangesTracker for {}, filter fpp was: {}", keyFilter, lazyBloomFilter.filter.expectedFpp());
+            }
+        }
     }
 
     public static class LazyBloomFilter {

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java?rev=1741633&r1=1741632&r2=1741633&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java Fri Apr 29 14:04:47 2016
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -370,6 +371,11 @@ public class NodeDocumentCache implement
             public boolean apply(@Nullable String input) {
                 return input != null && fromKey.compareTo(input) < 0 && toKey.compareTo(input) > 0;
             }
+
+            @Override
+            public String toString() {
+                return String.format("key range: <%s, %s>", fromKey, toKey);
+            }
         }, changeTrackers, bloomFilterSize);
     }
 
@@ -386,6 +392,24 @@ public class NodeDocumentCache implement
             public boolean apply(@Nullable String input) {
                 return input != null && keys.contains(input);
             }
+
+            @Override
+            public String toString() {
+                StringBuilder builder = new StringBuilder("key set [");
+                Iterator it = keys.iterator();
+                int i = 0;
+                while (it.hasNext() && i++ < 3) {
+                    builder.append(it.next());
+                    if (it.hasNext()) {
+                        builder.append(", ");
+                    }
+                }
+                if (it.hasNext()) {
+                    builder.append("...");
+                }
+                builder.append("]").append(" (").append(keys.size()).append(" elements)");
+                return builder.toString();
+            }
         }, changeTrackers, CacheChangesTracker.ENTRIES_SCOPED);
     }