Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3D0E104B0 for ; Thu, 15 Aug 2013 07:55:37 +0000 (UTC) Received: (qmail 30284 invoked by uid 500); 15 Aug 2013 07:55:37 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 30247 invoked by uid 500); 15 Aug 2013 07:55:37 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 30239 invoked by uid 99); 15 Aug 2013 07:55:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 07:55:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 07:55:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B007E23888E7; Thu, 15 Aug 2013 07:55:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1514191 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment: SegmentNodeState.java SegmentNodeStore.java Date: Thu, 15 Aug 2013 07:55:12 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130815075512.B007E23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Aug 15 07:55:12 2013 New Revision: 1514191 URL: http://svn.apache.org/r1514191 Log: OAK-659: Move purge logic for transient changes below the NodeBuilder interface Implement SegmentNodeStore.rebase() Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java?rev=1514191&r1=1514190&r2=1514191&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeState.java Thu Aug 15 07:55:12 2013 @@ -33,6 +33,13 @@ import org.apache.jackrabbit.oak.spi.sta public class SegmentNodeState extends AbstractNodeState { + static boolean fastEquals(NodeState a, NodeState b) { + return a instanceof SegmentNodeState + && b instanceof SegmentNodeState + && ((SegmentNodeState) a).recordId.equals( + ((SegmentNodeState) b).recordId); + } + private final SegmentStore store; private final RecordId recordId; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1514191&r1=1514190&r2=1514191&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java Thu Aug 15 07:55:12 2013 @@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.commit.PostCommitHook; import org.apache.jackrabbit.oak.spi.state.AbstractNodeStore; +import org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; @@ -83,12 +84,20 @@ public class SegmentNodeStore extends Ab return super.merge(builder, commitHook, committed); // TODO implement merge } - @Override + @Override @Nonnull public NodeState rebase(@Nonnull NodeBuilder builder) { - return super.rebase(builder); // TODO implement rebase + NodeState oldBase = builder.getBaseState(); + NodeState newBase = getRoot(); + if (!SegmentNodeState.fastEquals(oldBase, newBase)) { + NodeBuilder newBuilder = newBase.builder(); + builder.getNodeState().compareAgainstBaseState( + oldBase, new ConflictAnnotatingRebaseDiff(newBuilder)); + builder.reset(newBuilder.getNodeState()); + } + return builder.getNodeState(); } - @Override + @Override @Nonnull public NodeState reset(@Nonnull NodeBuilder builder) { NodeState state = getRoot(); checkNotNull(builder).reset(state);