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 md...@apache.org on 2014/11/10 14:53:24 UTC
svn commit: r1637862 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java
Author: mduerig
Date: Mon Nov 10 13:53:23 2014
New Revision: 1637862
URL: http://svn.apache.org/r1637862
Log:
OAK-2218 Allow SegmentNodeBuilder to provide child builders of the same type
- merged r1633768
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1633768
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java?rev=1637862&r1=1637861&r2=1637862&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeBuilder.java Mon Nov 10 13:53:23 2014
@@ -34,7 +34,19 @@ public class SegmentNodeBuilder extends
private final SegmentWriter writer;
- private long updateCount = 0;
+ /**
+ * Local update counter for the root builder.
+ *
+ * The value encodes both the counter and the type of the node builder:
+ * <ul>
+ * <li>value >= <code>0</code> represents a root builder (builder keeps
+ * counter updates)</li>
+ * <li>value = <code>-1</code> represents a child builder (value doesn't
+ * change, builder doesn't keep an updated counter)</li>
+ * </ul>
+ *
+ */
+ private long updateCount;
SegmentNodeBuilder(SegmentNodeState base) {
this(base, base.getTracker().getWriter());
@@ -43,24 +55,34 @@ public class SegmentNodeBuilder extends
SegmentNodeBuilder(SegmentNodeState base, SegmentWriter writer) {
super(base);
this.writer = writer;
+ this.updateCount = 0;
}
SegmentNodeBuilder(SegmentNodeBuilder parent, String name,
SegmentWriter writer) {
super(parent, name);
this.writer = writer;
+ this.updateCount = -1;
}
//-------------------------------------------------< MemoryNodeBuilder >--
@Override
protected void updated() {
- updateCount++;
- if (updateCount > UPDATE_LIMIT) {
- getNodeState();
+ if (isChildBuilder()) {
+ super.updated();
+ } else {
+ updateCount++;
+ if (updateCount > UPDATE_LIMIT) {
+ getNodeState();
+ }
}
}
+ private boolean isChildBuilder() {
+ return updateCount < 0;
+ }
+
//-------------------------------------------------------< NodeBuilder >--
@Override