Mailing-List: contact oak-dev-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: oak-dev@jackrabbit.apache.org
Received-SPF: error (athena.apache.org: local policy)
Message-ID: <51B08812.9070700@apache.org>
Date: Thu, 6 Jun 2013 14:01:06 +0100
From: =?UTF-8?B?TWljaGFlbCBEw7xyaWc=?= <mduerig@apache.org>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7;
 rv:17.0) Gecko/20130509 Thunderbird/17.0.6
MIME-Version: 1.0
To: <oak-dev@jackrabbit.apache.org>
Subject: Re: svn commit: r1490258 -
 /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
References: <20130606124129.2F45D23889BB@eris.apache.org>
In-Reply-To: <20130606124129.2F45D23889BB@eris.apache.org>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit


On 6.6.13 13:41, jukka@apache.org wrote:
> Author: jukka
> Date: Thu Jun  6 12:41:28 2013
> New Revision: 1490258
>
> URL: http://svn.apache.org/r1490258
> Log:
> OAK-781: Clarify / fix effects of MISSING_NODE as base state of NodeBuilder
>
> Fix the performance issue of a ConnectedHead never actually updating
> the head state after a rebase. It would just repeatedly create new
> UnconnectedHead instances without ever setting the head field. This
> commit makes updating the head field the responsibility of the head()
> method, which by centralizing the state transition should help avoid
> potential other similar issues.

Thanks for finding this. Looks better now.

> Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java?rev=1490258&r1=1490257&r2=1490258&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java (original)
> +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java Thu Jun  6 12:41:28 2013
> @@ -142,7 +142,11 @@ public class MemoryNodeBuilder implement
>        * @return  head of this builder
>        */
>       private Head head() {
> -        return head.update();
> +        Head newHead = head.update();
> +        if (newHead != head) {
> +            head = newHead;
> +        }
> +        return newHead;
>       }

Isn't this the same as

return head = head.update()

??

Michael