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 3BAEDCBC8 for ; Tue, 1 Oct 2013 10:20:13 +0000 (UTC) Received: (qmail 78147 invoked by uid 500); 1 Oct 2013 10:20:13 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 78106 invoked by uid 500); 1 Oct 2013 10:20:12 -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 78096 invoked by uid 99); 1 Oct 2013 10:20:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Oct 2013 10:20:11 +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; Tue, 01 Oct 2013 10:20:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 122F02388900; Tue, 1 Oct 2013 10:19:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528033 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core: ImmutableTree.java TreeTypeProvider.java Date: Tue, 01 Oct 2013 10:19:47 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131001101948.122F02388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Oct 1 10:19:47 2013 New Revision: 1528033 URL: http://svn.apache.org/r1528033 Log: OAK-1058 : Review TreeTypeProvider - avoid recalculating the tree type Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java?rev=1528033&r1=1528032&r2=1528033&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableTree.java Tue Oct 1 10:19:47 2013 @@ -98,6 +98,7 @@ public final class ImmutableTree extends private final TreeTypeProvider typeProvider; private String path; + private int type = TreeTypeProvider.TYPE_NONE; public ImmutableTree(@Nonnull NodeState rootState) { this(ParentProvider.ROOT_PROVIDER, "", rootState, TreeTypeProvider.EMPTY); @@ -249,7 +250,10 @@ public final class ImmutableTree extends //------------------------------------------------------------< internal >--- int getType() { - return typeProvider.getType(this); + if (type == TreeTypeProvider.TYPE_NONE) { + type = typeProvider.getType(this); + } + return type; } // TODO Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java?rev=1528033&r1=1528032&r2=1528033&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeTypeProvider.java Tue Oct 1 10:19:47 2013 @@ -23,6 +23,8 @@ import javax.annotation.Nullable; */ public interface TreeTypeProvider { + int TYPE_NONE = 0; + // regular trees int TYPE_DEFAULT = 1; // version store(s) content