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 an...@apache.org on 2012/07/31 17:02:37 UTC

svn commit: r1367597 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak: core/RootImpl.java core/TreeImpl.java kernel/KernelNodeBuilder.java kernel/KernelRootBuilder.java plugins/memory/MemoryNodeBuilder.java

Author: angela
Date: Tue Jul 31 15:02:37 2012
New Revision: 1367597

URL: http://svn.apache.org/viewvc?rev=1367597&view=rev
Log:
OAK-167: Caching NodeStore implementation

incomplete renaming of *NodeStateBuilder to *NodeBuilder -> adjusting comments

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilder.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1367597&r1=1367596&r2=1367597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java Tue Jul 31 15:02:37 2012
@@ -70,7 +70,7 @@ public class RootImpl implements Root {
      *
      * The {@link TreeImpl} instances us this mechanism to dispose of its associated
      * {@link NodeBuilder} on purge. Keeping a reference on those {@code TreeImpl}
-     * instances {@code NodeStateBuilder} (i.e. those which are modified) prevents them
+     * instances {@code NodeBuilder} (i.e. those which are modified) prevents them
      * from being prematurely garbage collected.
      */
     private List<PurgeListener> purgePurgeListeners = new ArrayList<PurgeListener>();

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java?rev=1367597&r1=1367596&r2=1367597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/TreeImpl.java Tue Jul 31 15:02:37 2012
@@ -53,7 +53,7 @@ public class TreeImpl implements Tree, P
     /** Name of this tree */
     private String name;
 
-    /** Lazily initialised {@code NodeStateBuilder} for the underlying node state */
+    /** Lazily initialised {@code NodeBuilder} for the underlying node state */
     NodeBuilder nodeBuilder;
 
     /**

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java?rev=1367597&r1=1367596&r2=1367597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java Tue Jul 31 15:02:37 2012
@@ -32,7 +32,7 @@ class KernelNodeBuilder extends MemoryNo
         this.root = checkNotNull(root);
     }
 
-    //--------------------------------------------< MemoryNodeStateBuilder >--
+    //--------------------------------------------------< MemoryNodeBuilder >---
 
     @Override
     protected MemoryNodeBuilder createChildBuilder(

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java?rev=1367597&r1=1367596&r2=1367597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java Tue Jul 31 15:02:37 2012
@@ -52,7 +52,7 @@ class KernelRootBuilder extends MemoryNo
         this.branchRevision = null;
     }
 
-    //--------------------------------------------< MemoryNodeStateBuilder >--
+    //--------------------------------------------------< MemoryNodeBuilder >---
 
     @Override
     protected MemoryNodeBuilder createChildBuilder(

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=1367597&r1=1367596&r2=1367597&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 Tue Jul 31 15:02:37 2012
@@ -204,7 +204,7 @@ public class MemoryNodeBuilder implement
         }
     }
 
-    //-------------------------------------------------< NodeStateBuilder >--
+    //--------------------------------------------------------< NodeBuilder >---
 
     @Override
     public NodeState getNodeState() {
@@ -374,7 +374,7 @@ public class MemoryNodeBuilder implement
 
     /**
      * The <em>mutable</em> state being built. Instances of this class
-     * are never passed beyond the containing MemoryNodeStateBuilder,
+     * are never passed beyond the containing {@code MemoryNodeBuilder},
      * so it's not a problem that we intentionally break the immutability
      * assumption of the {@link NodeState} interface.
      */