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 al...@apache.org on 2015/07/07 12:28:33 UTC
svn commit: r1689624 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
Author: alexparvulescu
Date: Tue Jul 7 10:28:32 2015
New Revision: 1689624
URL: http://svn.apache.org/r1689624
Log:
OAK-3076 Compaction should trace log the current processed path
- merged r1689623
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 7 10:28:32 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023,1685370,1685552,1685589-1685590
,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688636,1688817,1689003,1689577,1689581
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820,1684868,1685023,1685370,1685552,1685589-1685590
,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688636,1688817,1689003,1689577,1689581,1689623
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java?rev=1689624&r1=1689623&r2=1689624&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Compactor.java Tue Jul 7 10:28:32 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.segment;
+import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -106,23 +107,52 @@ public class Compactor {
private class CompactDiff extends ApplyDiff {
+ /**
+ * Current processed path, or null if the trace log is not enabled at
+ * the beginning of the compaction call. The null check will also be
+ * used to verify if a trace log will be needed or not
+ */
+ private final String path;
+
CompactDiff(NodeBuilder builder) {
super(builder);
+ if (log.isTraceEnabled()) {
+ this.path = "/";
+ } else {
+ this.path = null;
+ }
+ }
+
+ private CompactDiff(NodeBuilder builder, String path, String childName) {
+ super(builder);
+ if (path != null) {
+ this.path = concat(path, childName);
+ } else {
+ this.path = null;
+ }
}
@Override
public boolean propertyAdded(PropertyState after) {
+ if (path != null) {
+ log.trace("propertyAdded {}/{}", path, after.getName());
+ }
return super.propertyAdded(compact(after));
}
@Override
- public boolean propertyChanged(
- PropertyState before, PropertyState after) {
+ public boolean propertyChanged(PropertyState before, PropertyState after) {
+ if (path != null) {
+ log.trace("propertyChanged {}/{}", path, after.getName());
+ }
return super.propertyChanged(before, compact(after));
}
@Override
public boolean childNodeAdded(String name, NodeState after) {
+ if (path != null) {
+ log.trace("childNodeAdded {}/{}", path, name);
+ }
RecordId id = null;
if (after instanceof SegmentNodeState) {
id = ((SegmentNodeState) after).getRecordId();
@@ -135,7 +165,7 @@ public class Compactor {
NodeBuilder child = EmptyNodeState.EMPTY_NODE.builder();
boolean success = EmptyNodeState.compareAgainstEmptyState(after,
- new CompactDiff(child));
+ new CompactDiff(child, path, name));
if (success) {
SegmentNodeState state = writer.writeNode(child.getNodeState());
@@ -151,6 +181,10 @@ public class Compactor {
@Override
public boolean childNodeChanged(
String name, NodeState before, NodeState after) {
+ if (path != null) {
+ log.trace("childNodeChanged {}/{}", path, name);
+ }
+
RecordId id = null;
if (after instanceof SegmentNodeState) {
id = ((SegmentNodeState) after).getRecordId();
@@ -163,7 +197,7 @@ public class Compactor {
NodeBuilder child = builder.getChildNode(name);
boolean success = after.compareAgainstBaseState(before,
- new CompactDiff(child));
+ new CompactDiff(child, path, name));
if (success) {
RecordId compactedId = writer.writeNode(child.getNodeState())