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 ju...@apache.org on 2014/02/10 23:28:48 UTC
svn commit: r1566767 [2/2] - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/
oak-core/src/main/java/org/apache/j...
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java Mon Feb 10 22:28:47 2014
@@ -22,6 +22,7 @@ import java.util.Map;
import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -48,7 +49,7 @@ public class ManyChildNodesTest {
for (int i = 0; i < DocumentNodeState.MAX_FETCH_SIZE * 2; i++) {
builder.child("c-" + i);
}
- ns.merge(builder, EmptyHook.INSTANCE, null);
+ ns.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
store.queries.clear();
// must fetch in batches
for (ChildNodeEntry entry : ns.getRoot().getChildNodeEntries()) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java Mon Feb 10 22:28:47 2014
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
@@ -43,10 +44,9 @@ public class MergeRetryTest {
private static final CommitHook HOOK = new EditorHook(new EditorProvider() {
@CheckForNull
@Override
- public Editor getRootEditor(NodeState before,
- NodeState after,
- final NodeBuilder builder)
- throws CommitFailedException {
+ public Editor getRootEditor(
+ NodeState before, NodeState after, final NodeBuilder builder,
+ CommitInfo info) throws CommitFailedException {
return new DefaultEditor() {
@Override
public void enter(NodeState before, NodeState after)
@@ -80,8 +80,8 @@ public class MergeRetryTest {
NodeBuilder builder2 = ns2.getRoot().builder();
builder2.child("qux");
- ns1.merge(builder1, HOOK, null);
- ns2.merge(builder2, HOOK, null);
+ ns1.merge(builder1, HOOK, CommitInfo.EMPTY);
+ ns2.merge(builder2, HOOK, CommitInfo.EMPTY);
} finally {
mk1.dispose();
mk2.dispose();
@@ -109,8 +109,8 @@ public class MergeRetryTest {
NodeBuilder builder2 = ns2.getRoot().builder();
createTree(builder2.child("qux"), 2);
- ns1.merge(builder1, HOOK, null);
- ns2.merge(builder2, HOOK, null);
+ ns1.merge(builder1, HOOK, CommitInfo.EMPTY);
+ ns2.merge(builder2, HOOK, CommitInfo.EMPTY);
} finally {
mk1.dispose();
mk2.dispose();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/CacheInvalidationIT.java Mon Feb 10 22:28:47 2014
@@ -20,6 +20,7 @@
package org.apache.jackrabbit.oak.plugins.document.mongo;
import com.google.common.collect.Iterables;
+
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
@@ -29,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -72,7 +74,7 @@ public class CacheInvalidationIT extends
final int totalPaths = paths.length + 1; //1 extra for root
NodeBuilder root = getRoot(c1).builder();
createTree(root,paths);
- c1.merge(root, EmptyHook.INSTANCE, null);
+ c1.merge(root, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertEquals(totalPaths, Iterables.size(ds(c1).getCacheEntries()));
@@ -86,7 +88,7 @@ public class CacheInvalidationIT extends
NodeBuilder b2 = getRoot(c2).builder();
builder(b2,"/a/d").setProperty("foo", "bar");
- c2.merge(b2, EmptyHook.INSTANCE, null);
+ c2.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
//Push pending changes at /a
c2.runBackgroundOperations();
@@ -106,7 +108,7 @@ public class CacheInvalidationIT extends
NodeBuilder b2 = getRoot(c2).builder();
builder(b2,"/a/c").setProperty("foo", "bar");
- c2.merge(b2, EmptyHook.INSTANCE, null);
+ c2.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
//Push pending changes at /a
c2.runBackgroundOperations();
@@ -137,7 +139,7 @@ public class CacheInvalidationIT extends
NodeBuilder b2 = getRoot(c2).builder();
builder(b2,"/a/c").setProperty("foo", "bar");
- c2.merge(b2, EmptyHook.INSTANCE, null);
+ c2.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
//Push pending changes at /a
c2.runBackgroundOperations();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Mon Feb 10 22:28:47 2014
@@ -28,9 +28,11 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
+
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexLookup;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -78,7 +80,7 @@ public class AsyncIndexUpdateTest {
builder.child("testRoot").setProperty("foo", "abc");
// merge it back in
- store.merge(builder, EmptyHook.INSTANCE, null);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider);
async.run();
@@ -121,7 +123,7 @@ public class AsyncIndexUpdateTest {
builder.child("testSecond").setProperty("bar", "ghi");
// merge it back in
- store.merge(builder, EmptyHook.INSTANCE, null);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider);
async.run();
@@ -173,7 +175,7 @@ public class AsyncIndexUpdateTest {
.setProperty("foo", "xyz");
// merge it back in
- store.merge(builder, EmptyHook.INSTANCE, null);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
AsyncIndexUpdate async = new AsyncIndexUpdate("async", store, provider);
async.run();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Mon Feb 10 22:28:47 2014
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexLookup;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
@@ -83,7 +84,7 @@ public class IndexUpdateTest {
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
// first check that the index content nodes exist
checkPathExists(indexed, INDEX_DEFINITIONS_NAME, "rootIndex",
@@ -119,7 +120,7 @@ public class IndexUpdateTest {
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
// first check that the index content nodes exist
NodeState ns = checkPathExists(indexed, INDEX_DEFINITIONS_NAME,
@@ -155,7 +156,7 @@ public class IndexUpdateTest {
.setProperty(REINDEX_PROPERTY_NAME, true);
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
// first check that the index content nodes exist
NodeState ns = checkPathExists(indexed, INDEX_DEFINITIONS_NAME,
@@ -185,7 +186,7 @@ public class IndexUpdateTest {
ImmutableSet.of("foo"), null);
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
// check that the index content nodes exist
checkPathExists(indexed, INDEX_DEFINITIONS_NAME, "existing",
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java Mon Feb 10 22:28:47 2014
@@ -27,6 +27,7 @@ import java.util.Arrays;
import java.util.Set;
import com.google.common.collect.Sets;
+
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
@@ -40,6 +41,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.lifecycle.OakInitializer;
import org.apache.jackrabbit.oak.spi.query.Cursor;
@@ -78,7 +80,7 @@ public class NodeTypeIndexTest {
addFile(root, "file-1");
store.merge(root, new EditorHook(new IndexUpdateProvider(
- new PropertyIndexEditorProvider())), null);
+ new PropertyIndexEditorProvider())), CommitInfo.EMPTY);
NodeState rootState = store.getRoot();
NodeTypeIndex index = new NodeTypeIndex();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java Mon Feb 10 22:28:47 2014
@@ -40,12 +40,12 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.query.index.TraversingIndex;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableSet;
@@ -77,7 +77,7 @@ public class PropertyIndexTest {
}
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
FilterImpl f = createFilter(indexed, NT_BASE);
@@ -138,7 +138,7 @@ public class PropertyIndexTest {
c.setProperty("foo", "azerty");
}
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
FilterImpl f = createFilter(indexed, NT_BASE);
@@ -172,7 +172,7 @@ public class PropertyIndexTest {
}
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
FilterImpl f = createFilter(indexed, NT_BASE);
@@ -220,7 +220,7 @@ public class PropertyIndexTest {
NodeState after = builder.getNodeState();
// Add an index
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
FilterImpl f = createFilter(indexed, NT_BASE);
@@ -268,7 +268,7 @@ public class PropertyIndexTest {
.setProperty("foo", Arrays.asList("abc", "def"), Type.STRINGS);
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
FilterImpl f = createFilter(indexed, NT_UNSTRUCTURED);
@@ -324,7 +324,7 @@ public class PropertyIndexTest {
NodeState after = builder.getNodeState();
// Add an index
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
FilterImpl f = createFilter(after, NT_UNSTRUCTURED);
@@ -357,7 +357,7 @@ public class PropertyIndexTest {
Type.STRINGS);
NodeState after = builder.getNodeState();
- HOOK.processCommit(before, after); // should throw
+ HOOK.processCommit(before, after, CommitInfo.EMPTY); // should throw
}
@Test
@@ -376,7 +376,7 @@ public class PropertyIndexTest {
.setProperty("foo", "abc");
NodeState after = builder.getNodeState();
- HOOK.processCommit(before, after); // should not throw
+ HOOK.processCommit(before, after, CommitInfo.EMPTY); // should not throw
}
@Test(expected = CommitFailedException.class)
@@ -395,7 +395,7 @@ public class PropertyIndexTest {
.setProperty("foo", "abc");
NodeState after = builder.getNodeState();
- HOOK.processCommit(before, after); // should throw
+ HOOK.processCommit(before, after, CommitInfo.EMPTY); // should throw
}
@Test
@@ -415,7 +415,7 @@ public class PropertyIndexTest {
builder.getChildNode("b").remove();
NodeState after = builder.getNodeState();
- HOOK.processCommit(before, after); // should not throw
+ HOOK.processCommit(before, after, CommitInfo.EMPTY); // should not throw
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java Mon Feb 10 22:28:47 2014
@@ -24,6 +24,7 @@ import static org.easymock.EasyMock.repl
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -44,17 +45,17 @@ public class TypeEditorTest {
NodeState before = builder.getNodeState();
builder.child(":hidden");
NodeState after = builder.getNodeState();
- hook.processCommit(before, after);
+ hook.processCommit(before, after, CommitInfo.EMPTY);
before = after;
builder.child(":hidden").setProperty("prop", "value");
after = builder.getNodeState();
- hook.processCommit(before, after);
+ hook.processCommit(before, after, CommitInfo.EMPTY);
before = after;
builder.getChildNode(":hidden").remove();
after = builder.getNodeState();
- hook.processCommit(before, after);
+ hook.processCommit(before, after, CommitInfo.EMPTY);
}
@Test
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CheckpointTest.java Mon Feb 10 22:28:47 2014
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -63,14 +64,14 @@ public class CheckpointTest {
throws CommitFailedException {
NodeBuilder builder = store.getRoot().builder();
builder.child(name);
- store.merge(builder, EmptyHook.INSTANCE, null);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
private static void rmTestNode(NodeStore store, String name)
throws CommitFailedException {
NodeBuilder builder = store.getRoot().builder();
builder.child(name).remove();
- store.merge(builder, EmptyHook.INSTANCE, null);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java Mon Feb 10 22:28:47 2014
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -50,13 +51,13 @@ public class ExternalBlobTest {
if (!state.exists()) {
NodeBuilder builder = nodeStore.getRoot().builder();
builder.child("hello");
- nodeStore.merge(builder, EmptyHook.INSTANCE, null);
+ nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
Blob blob = getFileBlob();
NodeBuilder builder = nodeStore.getRoot().builder();
builder.getChildNode("hello").setProperty("world", blob);
- nodeStore.merge(builder, EmptyHook.INSTANCE, null);
+ nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
state = nodeStore.getRoot().getChildNode("hello");
blob = state.getProperty("world").getValue(Type.BINARY);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/JournalTest.java Mon Feb 10 22:28:47 2014
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEqu
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -46,7 +47,7 @@ public class JournalTest {
builder.setProperty("foo", "bar");
NodeState newState = builder.getNodeState();
- root.merge(builder, EmptyHook.INSTANCE, null);
+ root.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertEquals(newState, root.getRoot());
assertEquals(oldState, left.getRoot());
@@ -73,7 +74,7 @@ public class JournalTest {
builder.setProperty("foo", "bar");
NodeState newState = builder.getNodeState();
- left.merge(builder, EmptyHook.INSTANCE, null);
+ left.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertEquals(oldState, root.getRoot());
assertEquals(newState, left.getRoot());
@@ -100,7 +101,7 @@ public class JournalTest {
leftBuilder.setProperty("foo", "bar");
NodeState leftState = leftBuilder.getNodeState();
- left.merge(leftBuilder, EmptyHook.INSTANCE, null);
+ left.merge(leftBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertEquals(oldState, root.getRoot());
assertEquals(leftState, left.getRoot());
@@ -114,7 +115,7 @@ public class JournalTest {
NodeBuilder rightBuilder = oldState.builder();
rightBuilder.setProperty("bar", "foo");
- right.merge(rightBuilder, EmptyHook.INSTANCE, null);
+ right.merge(rightBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
store.getJournal("right").merge();
NodeState newState = root.getRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/MergeTest.java Mon Feb 10 22:28:47 2014
@@ -28,6 +28,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -45,14 +46,14 @@ public class MergeTest {
NodeBuilder a = store.getRoot().builder();
a.setProperty("foo", "abc");
- store.merge(a, EmptyHook.INSTANCE, null);
+ store.merge(a, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertTrue(store.getRoot().hasProperty("foo"));
assertFalse(store.getRoot().hasProperty("bar"));
NodeBuilder b = store.getRoot().builder();
b.setProperty("bar", "xyz");
- store.merge(b, EmptyHook.INSTANCE, null);
+ store.merge(b, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertTrue(store.getRoot().hasProperty("foo"));
assertTrue(store.getRoot().hasProperty("bar"));
@@ -71,12 +72,12 @@ public class MergeTest {
assertFalse(store.getRoot().hasProperty("foo"));
assertFalse(store.getRoot().hasProperty("bar"));
- store.merge(a, EmptyHook.INSTANCE, null);
+ store.merge(a, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertTrue(store.getRoot().hasProperty("foo"));
assertFalse(store.getRoot().hasProperty("bar"));
- store.merge(b, EmptyHook.INSTANCE, null);
+ store.merge(b, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertTrue(store.getRoot().hasProperty("foo"));
assertTrue(store.getRoot().hasProperty("bar"));
@@ -95,7 +96,7 @@ public class MergeTest {
try {
NodeBuilder a = store.getRoot().builder();
a.setProperty("foo", "abc" + i);
- store.merge(a, EmptyHook.INSTANCE, null);
+ store.merge(a, EmptyHook.INSTANCE, CommitInfo.EMPTY);
semaphore.release();
} catch (CommitFailedException e) {
fail();
@@ -116,7 +117,8 @@ public class MergeTest {
store.setMaximumBackoff(100);
store.merge(b, new CommitHook() {
@Override @Nonnull
- public NodeState processCommit(NodeState before, NodeState after) {
+ public NodeState processCommit(
+ NodeState before, NodeState after, CommitInfo info) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
@@ -124,7 +126,7 @@ public class MergeTest {
}
return after;
}
- }, null);
+ }, CommitInfo.EMPTY);
assertTrue(store.getRoot().hasProperty("foo"));
assertTrue(store.getRoot().hasProperty("bar"));
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/HiddenNodeTest.java Mon Feb 10 22:28:47 2014
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.jcr.Jcr;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -74,7 +75,7 @@ public class HiddenNodeTest {
NodeBuilder builder = store.getRoot().builder();
builder.child("test").child(":hidden").setProperty("property", "value");
- store.merge(builder, EmptyHook.INSTANCE, null);
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
session.refresh(false);
Version v1 = vMgr.checkpoint("/test");
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java Mon Feb 10 22:28:47 2014
@@ -33,6 +33,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.query.Cursor;
import org.apache.jackrabbit.oak.spi.query.Filter;
@@ -67,7 +68,7 @@ public class LuceneIndexTest {
builder.setProperty("foo", "bar");
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
QueryIndex queryIndex = new LuceneIndex(analyzer, null);
FilterImpl filter = createFilter(NT_BASE);
@@ -93,7 +94,7 @@ public class LuceneIndexTest {
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
QueryIndex queryIndex = new LuceneIndex(analyzer, null);
FilterImpl filter = createFilter(NT_BASE);
@@ -125,7 +126,7 @@ public class LuceneIndexTest {
NodeState after = builder.getNodeState();
- NodeState indexed = HOOK.processCommit(before, after);
+ NodeState indexed = HOOK.processCommit(before, after,CommitInfo.EMPTY);
QueryIndex queryIndex = new LuceneIndex(analyzer, null);
FilterImpl filter = createFilter(NT_BASE);
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java Mon Feb 10 22:28:47 2014
@@ -30,6 +30,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex;
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.query.Cursor;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
@@ -54,7 +55,7 @@ public class SolrIndexHookIT extends Sol
builder.child("newnode").setProperty("prop", "val");
NodeState after = builder.getNodeState();
- NodeState indexed = hook.processCommit(before, after);
+ NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY);
QueryIndex queryIndex = new SolrQueryIndex("solr", server, configuration);
FilterImpl filter = new FilterImpl(null, null);
@@ -83,7 +84,7 @@ public class SolrIndexHookIT extends Sol
builder.setProperty("foo", "bar");
NodeState after = builder.getNodeState();
- NodeState indexed = hook.processCommit(before, after);
+ NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY);
QueryIndex queryIndex = new SolrQueryIndex("solr", server, configuration);
FilterImpl filter = new FilterImpl(null, null);
@@ -117,7 +118,7 @@ public class SolrIndexHookIT extends Sol
NodeState after = builder.getNodeState();
- NodeState indexed = hook.processCommit(before, after);
+ NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY);
QueryIndex queryIndex = new SolrQueryIndex("solr", server, configuration);
FilterImpl filter = new FilterImpl(null, null);
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java Mon Feb 10 22:28:47 2014
@@ -49,6 +49,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider;
import org.apache.jackrabbit.oak.spi.commit.CompositeHook;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
@@ -299,7 +300,7 @@ public class RepositoryUpgrade {
new IndexUpdateProvider(new CompositeIndexEditorProvider(
new ReferenceEditorProvider(),
new PropertyIndexEditorProvider())))));
- target.merge(builder, hook, null);
+ target.merge(builder, hook, CommitInfo.EMPTY);
} catch (Exception e) {
throw new RepositoryException("Failed to copy content", e);
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java?rev=1566767&r1=1566766&r2=1566767&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/security/GroupEditorProvider.java Mon Feb 10 22:28:47 2014
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.upgrade.security;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.commit.EditorProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -26,7 +27,9 @@ import org.apache.jackrabbit.oak.spi.sta
public class GroupEditorProvider implements EditorProvider {
@Override
- public Editor getRootEditor(NodeState before, NodeState after, NodeBuilder builder) {
+ public Editor getRootEditor(
+ NodeState before, NodeState after,
+ NodeBuilder builder, CommitInfo info) {
return new GroupEditor(builder);
}
}
\ No newline at end of file