jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1365980 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel: KernelNodeBuilder.java KernelNodeStateBuilder.java KernelNodeStore.java KernelRootBuilder.java KernelRootStateBuilder.java
Date Thu, 26 Jul 2012 13:23:31 GMT
Author: jukka
Date: Thu Jul 26 13:23:31 2012
New Revision: 1365980

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

Rename KernelNodeStateBuilder to KernelNodeBuilder to match renamed interface

Added:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java
  (contents, props changed)
      - copied, changed from r1365978, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java
  (contents, props changed)
      - copied, changed from r1365978, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootStateBuilder.java
Removed:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootStateBuilder.java
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java
(from r1365978, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java&r1=1365978&r2=1365980&rev=1365980&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java
Thu Jul 26 13:23:31 2012
@@ -21,13 +21,13 @@ import static com.google.common.base.Pre
 import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 
-class KernelNodeStateBuilder extends MemoryNodeBuilder {
+class KernelNodeBuilder extends MemoryNodeBuilder {
 
-    private final KernelRootStateBuilder root;
+    private final KernelRootBuilder root;
 
-    public KernelNodeStateBuilder(
+    public KernelNodeBuilder(
             MemoryNodeBuilder parent, String name,
-            NodeState base, KernelRootStateBuilder root) {
+            NodeState base, KernelRootBuilder root) {
         super(parent, name, base);
         this.root = checkNotNull(root);
     }
@@ -37,7 +37,7 @@ class KernelNodeStateBuilder extends Mem
     @Override
     protected MemoryNodeBuilder createChildBuilder(
             String name, NodeState child) {
-        return new KernelNodeStateBuilder(this, name, child, root);
+        return new KernelNodeBuilder(this, name, child, root);
     }
 
     @Override

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java?rev=1365980&r1=1365979&r2=1365980&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
Thu Jul 26 13:23:31 2012
@@ -106,7 +106,7 @@ public class KernelNodeStore implements 
         if (base instanceof KernelNodeState) {
             KernelNodeState kbase = (KernelNodeState) base;
             if ("/".equals(kbase.getPath())) {
-                return new KernelRootStateBuilder(kernel, kbase.getRevision());
+                return new KernelRootBuilder(kernel, kbase.getRevision());
             }
         }
         return new MemoryNodeBuilder(base);

Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java
(from r1365978, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootStateBuilder.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootStateBuilder.java&r1=1365978&r2=1365980&rev=1365980&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootStateBuilder.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java
Thu Jul 26 13:23:31 2012
@@ -29,7 +29,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-class KernelRootStateBuilder extends MemoryNodeBuilder {
+class KernelRootBuilder extends MemoryNodeBuilder {
 
     /**
      * Number of content updates that need to happen before the updates
@@ -45,7 +45,7 @@ class KernelRootStateBuilder extends Mem
 
     private int updates = 0;
 
-    public KernelRootStateBuilder(MicroKernel kernel, String revision) {
+    public KernelRootBuilder(MicroKernel kernel, String revision) {
         super(new KernelNodeState(kernel, "/", revision));
         this.kernel = checkNotNull(kernel);
         this.baseRevision = checkNotNull(revision);
@@ -57,7 +57,7 @@ class KernelRootStateBuilder extends Mem
     @Override
     protected MemoryNodeBuilder createChildBuilder(
             String name, NodeState child) {
-        return new KernelNodeStateBuilder(this, name, child, this);
+        return new KernelNodeBuilder(this, name, child, this);
     }
 
     @Override

Propchange: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelRootBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message