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 ca...@apache.org on 2016/01/25 05:06:13 UTC
svn commit: r1726568 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document:
DocumentNodeStore.java LocalDiffCache.java MemoryDiffCache.java
Author: catholicon
Date: Mon Jan 25 04:06:13 2016
New Revision: 1726568
URL: http://svn.apache.org/viewvc?rev=1726568&view=rev
Log:
OAK-2675: Include change type information in perf logs for diff logic
Add type of change to diffImpl logs. Also, log when an entry is pushed into local/memory cache
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.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=1726568&r1=1726567&r2=1726568&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 Mon Jan 25 04:06:13 2016
@@ -2229,9 +2229,10 @@ public final class DocumentNodeStore
String diff = w.toString();
if (debug) {
long end = now();
- LOG.debug("Diff performed via '{}' at [{}] between revisions [{}] => [{}] took {} ms ({} ms), diff '{}'",
+ LOG.debug("Diff performed via '{}' at [{}] between revisions [{}] => [{}] took {} ms ({} ms), diff '{}', external '{}",
diffAlgo, from.getPath(), fromRev, toRev,
- end - start, getChildrenDoneIn - start, diff);
+ end - start, getChildrenDoneIn - start, diff,
+ to.isFromExternalChange());
}
return diff;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java?rev=1726568&r1=1726567&r2=1726568&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java Mon Jan 25 04:06:13 2016
@@ -32,11 +32,14 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A diff cache, which is pro-actively filled after a commit.
*/
public class LocalDiffCache extends DiffCache {
+ private static final Logger LOG = LoggerFactory.getLogger(LocalDiffCache.class);
/**
* Limit is arbitrary for now i.e. 16 MB. Same as in MongoDiffCache
@@ -94,6 +97,7 @@ public class LocalDiffCache extends Diff
}
diffCache.put(new RevisionsKey(from, to),
new Diff(changesPerPath, size));
+ LOG.debug("Adding cache entry from {} to {}", from, to);
return true;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java?rev=1726568&r1=1726567&r2=1726568&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java Mon Jan 25 04:06:13 2016
@@ -28,6 +28,8 @@ import org.apache.jackrabbit.oak.cache.C
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import com.google.common.cache.Cache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.commons.PathUtils.denotesRoot;
@@ -38,6 +40,7 @@ import static org.apache.jackrabbit.oak.
* An in-memory diff cache implementation.
*/
public class MemoryDiffCache extends DiffCache {
+ private static final Logger LOG = LoggerFactory.getLogger(MemoryDiffCache.class);
/**
* Diff cache.
@@ -114,6 +117,7 @@ public class MemoryDiffCache extends Dif
@Override
public void append(@Nonnull String path, @Nonnull String changes) {
PathRev key = diffCacheKey(path, from, to);
+ LOG.debug("Adding cache entry for {} from {} to {}", path, from, to);
diffCache.put(key, new StringValue(changes));
}