jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1236758 - in /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk: model/ store/
Date Fri, 27 Jan 2012 16:57:05 GMT
Author: stefan
Date: Fri Jan 27 16:57:04 2012
New Revision: 1236758

URL: http://svn.apache.org/viewvc?rev=1236758&view=rev
Log:
flat hierarchy support (WIP)

Modified:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/AbstractNode.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesBucket.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesInlined.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesTree.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/Node.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/StoredNode.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/AbstractPersistenceManager.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/BDbPersistenceManager.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/FSPersistenceManager.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/H2PersistenceManager.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/InMemPersistenceManager.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/MongoPersistenceManager.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionProvider.java
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/AbstractNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/AbstractNode.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/AbstractNode.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/AbstractNode.java
Fri Jan 27 16:57:04 2012
@@ -37,7 +37,7 @@ public abstract class AbstractNode imple
 
     protected HashMap<String, String> properties;
 
-    protected ChildNodeEntriesInlined childEntries;
+    protected ChildNodeEntries childEntries;
 
     protected AbstractNode() {
         this.properties = new HashMap<String, String>();
@@ -48,11 +48,18 @@ public abstract class AbstractNode imple
         if (other instanceof AbstractNode) {
             AbstractNode srcNode = (AbstractNode) other;
             this.properties = (HashMap<String, String>) srcNode.properties.clone();
-            this.childEntries = (ChildNodeEntriesInlined) srcNode.childEntries.clone();
+            this.childEntries = (ChildNodeEntries) srcNode.childEntries.clone();
         } else {
             this.properties = new HashMap<String, String>(other.getProperties());
             this.childEntries = new ChildNodeEntriesInlined();
-            for (Iterator<ChildNodeEntry> it = other.getChildNodeEntries(); it.hasNext();
) {
+/*
+            if (other.getChildNodeCount() <= ChildNodeEntries.CAPACITY_THRESHOLD) {
+                this.childEntries = new ChildNodeEntriesInlined();
+            } else {
+                this.childEntries = new ChildNodeEntriesTree();
+            }
+*/
+            for (Iterator<ChildNodeEntry> it = other.getChildNodeEntries(0, -1); it.hasNext();
) {
                 ChildNodeEntry cne = it.next();
                 this.childEntries.add(cne);
             }
@@ -75,10 +82,6 @@ public abstract class AbstractNode imple
         return childEntries.getCount();
     }
 
-    public Iterator<ChildNodeEntry> getChildNodeEntries() {
-        return getChildNodeEntries(0, -1);
-    }
-
     public Iterator<ChildNodeEntry> getChildNodeEntries(int offset, int count) {
         return childEntries.getEntries(offset, count);
     }
@@ -99,7 +102,7 @@ public abstract class AbstractNode imple
             count = childEntries.getCount() - offset;
         }
 
-        return new AbstractRangeIterator<ChildNode>(childEntries.getEntries(0, -1),
offset, count) {
+        return new AbstractRangeIterator<ChildNode>(childEntries.getEntries(offset,
count), 0, -1) {
             @Override
             protected ChildNode doNext() {
                 ChildNodeEntry cne = (ChildNodeEntry) it.next();
@@ -157,7 +160,7 @@ public abstract class AbstractNode imple
         // compare child node entries
 
         if (other instanceof AbstractNode) {
-            ChildNodeEntriesInlined otherEntries = ((AbstractNode) other).childEntries;
+            ChildNodeEntries otherEntries = ((AbstractNode) other).childEntries;
             for (Iterator<ChildNodeEntry> it = childEntries.getAdded(otherEntries);
it.hasNext(); ) {
                 handler.childNodeAdded(it.next());
             }

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntries.java
Fri Jan 27 16:57:04 2012
@@ -22,6 +22,10 @@ import java.util.Iterator;
  *
  */
 public interface ChildNodeEntries extends Cloneable {
+    
+    static final int CAPACITY_THRESHOLD = 5000;
+
+    Object clone();
 
     //-------------------------------------------------------------< read ops >
 

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesBucket.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesBucket.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesBucket.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesBucket.java
Fri Jan 27 16:57:04 2012
@@ -39,7 +39,7 @@ public class ChildNodeEntriesBucket exte
     }
 
     @Override
-    protected Object clone()  {
+    public Object clone()  {
         ChildNodeEntriesBucket clone = (ChildNodeEntriesBucket) super.clone();
         clone.entries = (HashMap<String, ChildNodeEntry>) entries.clone();
         return clone;

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesInlined.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesInlined.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesInlined.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesInlined.java
Fri Jan 27 16:57:04 2012
@@ -49,7 +49,7 @@ public class ChildNodeEntriesInlined imp
     }
 
     @Override
-    protected Object clone()  {
+    public Object clone()  {
         ChildNodeEntriesInlined clone = null;
         try {
             clone = (ChildNodeEntriesInlined) super.clone();

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesTree.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesTree.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/ChildNodeEntriesTree.java
Fri Jan 27 16:57:04 2012
@@ -55,7 +55,7 @@ public class ChildNodeEntriesTree implem
     }
 
     @Override
-    protected Object clone() {
+    public Object clone() {
         ChildNodeEntriesTree clone = null;
         try {
             clone = (ChildNodeEntriesTree) super.clone();

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
Fri Jan 27 16:57:04 2012
@@ -361,7 +361,6 @@ public class CommitBuilder {
             mergedNode.getProperties().remove(name);
         }
 
-        // todo fixme
         for (Map.Entry<String, String> entry : ourChanges.getAddedChildNodes ().entrySet())
{
             mergedNode.add(new ChildNodeEntry(entry.getKey(), entry.getValue()));
         }

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/Node.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/Node.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/Node.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/Node.java
Fri Jan 27 16:57:04 2012
@@ -37,10 +37,6 @@ public interface Node {
     /**
      * @deprecated use getChildNodes(int, int, RevisionProvider) instead
      */
-    Iterator<ChildNodeEntry> getChildNodeEntries();
-    /**
-     * @deprecated use getChildNodes(int, int, RevisionProvider) instead
-     */
     Iterator<ChildNodeEntry> getChildNodeEntries(int offset, int count);
 
     Iterator<ChildNode> getChildNodes(int offset, int count, RevisionProvider provider)
throws Exception;

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/StoredNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/StoredNode.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/StoredNode.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/model/StoredNode.java
Fri Jan 27 16:57:04 2012
@@ -52,10 +52,6 @@ public class StoredNode extends Abstract
         return Collections.unmodifiableMap(properties);
     }
 
-    public Iterator<ChildNodeEntry> getChildNodeEntries() {
-        return getChildNodeEntries(0, -1);
-    }
-
     public Iterator<ChildNodeEntry> getChildNodeEntries(int offset, int count) {
         return new UnmodifiableIterator<ChildNodeEntry>(super.getChildNodeEntries(offset,
count));
     }

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/AbstractPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/AbstractPersistenceManager.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/AbstractPersistenceManager.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/AbstractPersistenceManager.java
Fri Jan 27 16:57:04 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.mk.store;
 
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.MutableCommit;
 import org.apache.jackrabbit.mk.model.Node;
@@ -56,8 +57,12 @@ public abstract class AbstractPersistenc
 
     protected abstract StoredNode readNode(String id) throws NotFoundException, Exception;
 
+    protected abstract ChildNodeEntriesBucket readCNEBucket(String id) throws NotFoundException,
Exception;
+
     protected abstract String writeNode(Node node) throws Exception;
 
+    protected abstract String writeCNEBucket(ChildNodeEntriesBucket bucket) throws Exception;
+
     protected abstract StoredCommit readCommit(String id) throws NotFoundException, Exception;
 
     protected abstract String writeCommit(Commit commit) throws Exception;
@@ -124,6 +129,16 @@ public abstract class AbstractPersistenc
         return id;
     }
 
+    public String putCNEBucket(ChildNodeEntriesBucket bucket) throws Exception {
+        verifyInitialized();
+
+        String id = writeCNEBucket(bucket);
+        // todo fixme
+        //cache.put(id, new ChildNodeEntriesBucket(id, bucket));
+
+        return id;
+    }
+
     public String putCommit(Commit commit) throws Exception {
         verifyInitialized();
 
@@ -176,6 +191,21 @@ public abstract class AbstractPersistenc
         return node;
     }
 
+    public ChildNodeEntriesBucket getCNEBucket(String id) throws NotFoundException, Exception
{
+        verifyInitialized();
+
+        ChildNodeEntriesBucket bucket = (ChildNodeEntriesBucket) cache.get(id);
+        if (bucket != null) {
+            return bucket;
+        }
+
+        bucket = readCNEBucket(id);
+
+        cache.put(id, bucket);
+
+        return bucket;
+    }
+
     public StoredCommit getCommit(String id) throws NotFoundException, Exception {
         verifyInitialized();
 

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/BDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/BDbPersistenceManager.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/BDbPersistenceManager.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/BDbPersistenceManager.java
Fri Jan 27 16:57:04 2012
@@ -21,6 +21,7 @@ import java.io.InputStream;
 
 import org.apache.jackrabbit.mk.blobs.BlobStore;
 import org.apache.jackrabbit.mk.blobs.FileBlobStore;
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.Node;
 import org.apache.jackrabbit.mk.model.StoredCommit;
@@ -174,6 +175,20 @@ public class BDbPersistenceManager exten
         return blobStore.getBlobLength(blobId);
     }
 
+    @Override
+    protected ChildNodeEntriesBucket readCNEBucket(String id) throws NotFoundException, Exception
{
+        // todo implement
+        return null;
+    }
+
+    @Override
+    protected String writeCNEBucket(ChildNodeEntriesBucket bucket) throws Exception {
+        // todo implement
+        return null;
+    }
+
+    //-------------------------------------------------------< implementation >
+
     protected String persist(byte[] bytes, byte[] rawId) throws Exception {
         String id = StringUtils.convertBytesToHex(rawId);
 

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/FSPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/FSPersistenceManager.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/FSPersistenceManager.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/FSPersistenceManager.java
Fri Jan 27 16:57:04 2012
@@ -25,6 +25,7 @@ import java.io.InputStream;
 
 import org.apache.jackrabbit.mk.blobs.BlobStore;
 import org.apache.jackrabbit.mk.blobs.FileBlobStore;
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.Node;
 import org.apache.jackrabbit.mk.model.StoredCommit;
@@ -145,6 +146,20 @@ public class FSPersistenceManager extend
         return blobStore.getBlobLength(blobId);
     }
 
+    @Override
+    protected ChildNodeEntriesBucket readCNEBucket(String id) throws NotFoundException, Exception
{
+        // todo implement
+        return null;
+    }
+
+    @Override
+    protected String writeCNEBucket(ChildNodeEntriesBucket bucket) throws Exception {
+        // todo implement
+        return null;
+    }
+
+    //-------------------------------------------------------< implementation >
+
     private File getFile(String id) {
         StringBuilder buf = new StringBuilder(id.substring(0, 2));
         buf.append('/');

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/H2PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/H2PersistenceManager.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/H2PersistenceManager.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/H2PersistenceManager.java
Fri Jan 27 16:57:04 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.mk.store;
 import org.apache.jackrabbit.mk.blobs.BlobStore;
 import org.apache.jackrabbit.mk.blobs.DbBlobStore;
 import org.apache.jackrabbit.mk.blobs.FileBlobStore;
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.Node;
 import org.apache.jackrabbit.mk.model.StoredCommit;
@@ -216,4 +217,16 @@ public class H2PersistenceManager extend
     protected long blobLength(String blobId) throws NotFoundException, Exception {
         return blobStore.getBlobLength(blobId);
     }
+
+    @Override
+    protected ChildNodeEntriesBucket readCNEBucket(String id) throws NotFoundException, Exception
{
+        // todo implement
+        return null;
+    }
+
+    @Override
+    protected String writeCNEBucket(ChildNodeEntriesBucket bucket) throws Exception {
+        // todo implement
+        return null;
+    }
 }

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/InMemPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/InMemPersistenceManager.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/InMemPersistenceManager.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/InMemPersistenceManager.java
Fri Jan 27 16:57:04 2012
@@ -24,6 +24,7 @@ import java.util.Map;
 
 import org.apache.jackrabbit.mk.blobs.BlobStore;
 import org.apache.jackrabbit.mk.blobs.MemoryBlobStore;
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.Node;
 import org.apache.jackrabbit.mk.model.StoredCommit;
@@ -120,4 +121,16 @@ public class InMemPersistenceManager ext
     protected long blobLength(String blobId) throws NotFoundException, Exception {
         return blobs.getBlobLength(blobId);
     }
+
+    @Override
+    protected ChildNodeEntriesBucket readCNEBucket(String id) throws NotFoundException, Exception
{
+        // todo implement
+        return null;
+    }
+
+    @Override
+    protected String writeCNEBucket(ChildNodeEntriesBucket bucket) throws Exception {
+        // todo implement
+        return null;
+    }
 }

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/MongoPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/MongoPersistenceManager.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/MongoPersistenceManager.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/MongoPersistenceManager.java
Fri Jan 27 16:57:04 2012
@@ -23,6 +23,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.ChildNodeEntry;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.Node;
@@ -268,6 +269,20 @@ public class MongoPersistenceManager ext
         return f.getLength();
     }
 
+    @Override
+    protected ChildNodeEntriesBucket readCNEBucket(String id) throws NotFoundException, Exception
{
+        // todo implement
+        return null;
+    }
+
+    @Override
+    protected String writeCNEBucket(ChildNodeEntriesBucket bucket) throws Exception {
+        // todo implement
+        return null;
+    }
+
+    //-------------------------------------------------------< implementation >
+
     protected static Map<String, String> encodeKeys(Map<String, String> map)
{
         boolean needsEncoding = false;
         for (String key : map.keySet()) {

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionProvider.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionProvider.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionProvider.java
Fri Jan 27 16:57:04 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.mk.store;
 
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.StoredCommit;
 import org.apache.jackrabbit.mk.model.StoredNode;
 
@@ -26,6 +27,7 @@ public interface RevisionProvider {
 
     StoredNode getNode(String id) throws NotFoundException, Exception;
     StoredCommit getCommit(String id) throws NotFoundException, Exception;
+    ChildNodeEntriesBucket getCNEBucket(String id) throws NotFoundException, Exception;
     StoredNode getRootNode(String commitId) throws NotFoundException, Exception;
     StoredCommit getHeadCommit() throws Exception;
     String getHeadCommitId() throws Exception;

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java?rev=1236758&r1=1236757&r2=1236758&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
(original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/RevisionStore.java
Fri Jan 27 16:57:04 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.mk.store;
 
+import org.apache.jackrabbit.mk.model.ChildNodeEntriesBucket;
 import org.apache.jackrabbit.mk.model.Commit;
 import org.apache.jackrabbit.mk.model.Node;
 
@@ -28,6 +29,7 @@ public interface RevisionStore extends R
 
     String /*id*/ putNode(Node node) throws Exception;
     String /*id*/ putCommit(Commit commit) throws Exception;
+    String /*id*/ putCNEBucket(ChildNodeEntriesBucket bucket) throws Exception;
     void setHeadCommitId(String commitId) throws Exception;
     void lockHead();
     void unlockHead();



Mime
View raw message