You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2012/01/31 15:06:18 UTC
svn commit: r1238558 - in /jackrabbit/sandbox/microkernel/src:
main/java/org/apache/jackrabbit/mk/api/
main/java/org/apache/jackrabbit/mk/mem/
test/java/org/apache/jackrabbit/mk/api/
test/java/org/apache/jackrabbit/mk/blobs/
Author: thomasm
Date: Tue Jan 31 14:06:18 2012
New Revision: 1238558
URL: http://svn.apache.org/viewvc?rev=1238558&view=rev
Log:
Fix test cases; documentation
Modified:
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1238558&r1=1238557&r2=1238558&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java Tue Jan 31 14:06:18 2012
@@ -139,7 +139,6 @@ public interface MicroKernel {
* @throws MicroKernelException if an error occurs
* @throws InterruptedException if the thread was interrupted
*/
-
String waitForCommit(String oldHeadRevision, long maxWaitMillis) throws MicroKernelException, InterruptedException;
/**
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java?rev=1238558&r1=1238557&r2=1238558&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/mem/MemoryKernelImpl.java Tue Jan 31 14:06:18 2012
@@ -172,11 +172,9 @@ public class MemoryKernelImpl extends Wr
}
public synchronized String commitStream(String rootPath, JsopReader jsonDiff, String revisionId, String message) {
+ // TODO message should be json
// TODO do we really need 'path'? store the path is in the diff instead
- // TODO increment headRevId less often? commit in the background?
- // would be possible if we don't (always) return the head revision
- // TODO metadata in storage (version)
- // TODO optional read / write version in json 'api' (as comments?)
+ // TODO read / write version
// TODO possibly support two phase commit
// TODO getJournal and getRevision don't have a path,
// which means we can't implement access rights using path prefixes
@@ -565,7 +563,6 @@ public class MemoryKernelImpl extends Wr
} else if (path.equals("/:info")) {
return true;
}
- // TODO possibly use a cache / a bloom filter
return getRevisionDataRoot(revisionId).exists(path.substring(1));
}
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java?rev=1238558&r1=1238557&r2=1238558&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java Tue Jan 31 14:06:18 2012
@@ -239,10 +239,10 @@ public class MicroKernelTest extends Mul
String head = mk.getHeadRevision();
String node = "reorderNode_" + System.currentTimeMillis();
head = mk.commit("/", "+\"" + node + "\" : {\"a\":{}, \"b\":{}, \"c\":{}}", head, "");
- System.out.println(mk.getNodes('/' + node, head).replaceAll("\"", "").replaceAll(":childNodeCount:.", ""));
+ // System.out.println(mk.getNodes('/' + node, head).replaceAll("\"", "").replaceAll(":childNodeCount:.", ""));
head = mk.commit("/", ">\"" + node + "/a\" : {\"before\":\"" + node + "/c\"}", head, "");
- System.out.println(mk.getNodes('/' + node, head).replaceAll("\"", "").replaceAll(":childNodeCount:.", ""));
+ // System.out.println(mk.getNodes('/' + node, head).replaceAll("\"", "").replaceAll(":childNodeCount:.", ""));
}
@Test
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java?rev=1238558&r1=1238557&r2=1238558&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java Tue Jan 31 14:06:18 2012
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.mk.blobs;
public class MongoBlobStoreTest extends DbBlobStoreTest {
public void setUp() throws Exception {
+ store = new MemoryBlobStore();
// store = new MongoBlobStore();
}