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 to...@apache.org on 2017/05/12 11:00:36 UTC
svn commit: r1794954 [2/2] - in /jackrabbit/oak/trunk: ./ oak-benchmarks/
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/
oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/
oak-commons/src/test/java/org/apache/jackrabbit/...
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java Fri May 12 11:00:35 2017
@@ -15,27 +15,27 @@
* limitations under the License.
*/
/**
- * <h1>Federation support</h1>
+ * <h1>Composition support</h1>
*
- * <p>This package contains support classes for implementing a federated persistence at the {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore} level.</p>
+ * <p>This package contains support classes for implementing a composite persistence at the {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore} level.</p>
*
* <h2>Design goals</h2>
* <ol>
- * <li>Transparency of the federation setup. Neither the NodeStores nor the code using a federated
+ * <li>Transparency of the composition setup. Neither the NodeStores nor the code using a composite
* NodeStore should be aware of the specific implementation being used.</li>
- * <li>Persistence-agnosticity. The federation support should be applicable to any conformant
+ * <li>Persistence-agnosticity. The composition support should be applicable to any conformant
* NodeStore implementation.</li>
- * <li>Negligible performance impact. Federation should not add a significat performance overhead.</li>
+ * <li>Negligible performance impact. Composition should not add a significat performance overhead.</li>
* </ol>
*
* <h2>Implementation</h2>
*
- * <p>The main entry point is the {@link org.apache.jackrabbit.oak.federated.FederatedNodeStore},
- * which wraps one or more NodeStore instances. Also of interest are the {@link org.apache.jackrabbit.oak.federated.FederatedNodeState} and {@link org.apache.jackrabbit.oak.federated.FederatedNodeBuilder}.
+ * <p>The main entry point is the {@link org.apache.jackrabbit.oak.composite.CompositeNodeStore},
+ * which wraps one or more NodeStore instances. Also of interest are the {@link org.apache.jackrabbit.oak.composite.CompositeNodeState} and {@link org.apache.jackrabbit.oak.composite.CompositeNodeBuilder}.
*
* <p>These classes maintain internal mappings of the 'native' objects. For instance, if the
- * federated NodeStore holds two MemoryNodeStore instances, then a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore#getRoot()}
- * will return a federated NodeState backed by two MemoryNodeState instances. Similarly, a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeState#builder()} will return a federated
+ * composite NodeStore holds two MemoryNodeStore instances, then a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore#getRoot()}
+ * will return a composite NodeState backed by two MemoryNodeState instances. Similarly, a call to {@linkplain org.apache.jackrabbit.oak.spi.state.NodeState#builder()} will return a composite
* NodeBuilder backed by two MemoryNodeState instances.
*
* <p>Using this approach allows us to always keep related NodeStore, NodeState and NodeBuilder
@@ -53,7 +53,7 @@
*
* <p>The current implementation naively queries all stores whenever the child node list is prepared.
* This is obviously correct but may be slow.
- * {@link org.apache.jackrabbit.oak.federated.FederationContext#getContributingStores(java.lang.String, com.google.common.base.Function)}
+ * {@link org.apache.jackrabbit.oak.composite.CompositionContext#getContributingStores(java.lang.String, com.google.common.base.Function)}
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
Copied: jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java Fri May 12 11:00:35 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -52,15 +52,15 @@ import static java.util.Collections.empt
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertEquals;
-public class FederatedChildrenCountTest {
+public class CompositeChildrenCountTest {
@Test
public void singleContributingStore() {
MountInfoProvider mip = Mounts.newBuilder().build();
NodeStore globalStore = new MemoryNodeStore();
- FederatedNodeStore federatedNodeStore = new FederatedNodeStore.Builder(mip, globalStore).build();
+ CompositeNodeStore compositeNodeStore = new CompositeNodeStore.Builder(mip, globalStore).build();
- FederatedNodeStoreBuilder b = new FederatedNodeStoreBuilder(federatedNodeStore.ctx);
+ CompositeNodeStoreBuilder b = new CompositeNodeStoreBuilder(compositeNodeStore.ctx);
b.configureMount("/", MAX_VALUE);
assertEquals(MAX_VALUE, b.getNodeState().getChildNodeCount(123));
@@ -76,13 +76,13 @@ public class FederatedChildrenCountTest
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
+ CompositeNodeStore compositeNodeStore = new CompositeNodeStore(mip, globalStore, mounts);
- FederatedNodeStoreBuilder b = new FederatedNodeStoreBuilder(federatedNodeStore.ctx);
+ CompositeNodeStoreBuilder b = new CompositeNodeStoreBuilder(compositeNodeStore.ctx);
TestingNodeState globalTestingNS = b.configureMount("/", 5);
TestingNodeState libsTestingNS = b.configureMount("/libs", "libs", "libs1", "libs2");
- FederatedNodeState mns = b.getNodeState();
+ CompositeNodeState mns = b.getNodeState();
assertEquals(8, mns.getChildNodeCount(9));
assertEquals(5, globalTestingNS.fetchedChildren);
@@ -127,13 +127,13 @@ public class FederatedChildrenCountTest
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
+ CompositeNodeStore compositeNodeStore = new CompositeNodeStore(mip, globalStore, mounts);
- FederatedNodeStoreBuilder b = new FederatedNodeStoreBuilder(federatedNodeStore.ctx);
+ CompositeNodeStoreBuilder b = new CompositeNodeStoreBuilder(compositeNodeStore.ctx);
TestingNodeState globalTestingNS = b.configureMount("/", 5);
TestingNodeState libsTestingNS = b.configureMount("/libs", MAX_VALUE);
- FederatedNodeState mns = b.getNodeState();
+ CompositeNodeState mns = b.getNodeState();
assertEquals(MAX_VALUE, mns.getChildNodeCount(100));
assertEquals(5, globalTestingNS.fetchedChildren);
@@ -146,13 +146,13 @@ public class FederatedChildrenCountTest
assertEquals(0, libsTestingNS.fetchedChildren);
}
- private static class FederatedNodeStoreBuilder {
+ private static class CompositeNodeStoreBuilder {
private final Map<MountedNodeStore, NodeState> rootStates = newHashMap();
- private final FederationContext ctx;
+ private final CompositionContext ctx;
- public FederatedNodeStoreBuilder(FederationContext ctx) {
+ public CompositeNodeStoreBuilder(CompositionContext ctx) {
this.ctx = ctx;
}
@@ -168,11 +168,11 @@ public class FederatedChildrenCountTest
return nodeState;
}
- public FederatedNodeState getNodeState() {
- return new FederatedNodeState("/", rootStates, ctx);
+ public CompositeNodeState getNodeState() {
+ return new CompositeNodeState("/", rootStates, ctx);
}
- public FederatedNodeStoreBuilder clear() {
+ public CompositeNodeStoreBuilder clear() {
rootStates.clear();
return this;
}
Copied: jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeCompareTest.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeCompareTest.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeCompareTest.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeCompareTest.java Fri May 12 11:00:35 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -42,7 +42,7 @@ import static com.google.common.collect.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class FederatedCompareTest {
+public class CompositeCompareTest {
@Test
public void reportedNodesAreWrapped() {
@@ -51,11 +51,11 @@ public class FederatedCompareTest {
MountInfoProvider mip = mipBuilder.build();
NodeStore globalStore = new MemoryNodeStore();
- FederatedNodeStore.Builder nsBuilder = new FederatedNodeStore.Builder(mip, globalStore);
+ CompositeNodeStore.Builder nsBuilder = new CompositeNodeStore.Builder(mip, globalStore);
nsBuilder.addMount("libs", new MemoryNodeStore());
- FederatedNodeStore federatedNodeStore = nsBuilder.build();
+ CompositeNodeStore compositeNodeStore = nsBuilder.build();
- NodeBuilder builder = federatedNodeStore.getRoot().builder();
+ NodeBuilder builder = compositeNodeStore.getRoot().builder();
builder.child("changed");
builder.child("deleted");
NodeState base = builder.getNodeState();
@@ -69,7 +69,7 @@ public class FederatedCompareTest {
modified.compareAgainstBaseState(base, new DefaultNodeStateDiff() {
@Override
public boolean childNodeAdded(String name, NodeState after) {
- assertTrue(after instanceof FederatedNodeState);
+ assertTrue(after instanceof CompositeNodeState);
assertEquals(name, "added");
modifiedNodes.add(name);
return true;
@@ -77,8 +77,8 @@ public class FederatedCompareTest {
@Override
public boolean childNodeChanged(String name, NodeState before, NodeState after) {
- assertTrue(before instanceof FederatedNodeState);
- assertTrue(after instanceof FederatedNodeState);
+ assertTrue(before instanceof CompositeNodeState);
+ assertTrue(after instanceof CompositeNodeState);
assertEquals(name, "changed");
modifiedNodes.add(name);
return true;
@@ -86,7 +86,7 @@ public class FederatedCompareTest {
@Override
public boolean childNodeDeleted(String name, NodeState before) {
- assertTrue(before instanceof FederatedNodeState);
+ assertTrue(before instanceof CompositeNodeState);
assertEquals(name, "deleted");
modifiedNodes.add(name);
return true;
@@ -103,9 +103,9 @@ public class FederatedCompareTest {
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
+ CompositeNodeStore compositeNodeStore = new CompositeNodeStore(mip, globalStore, mounts);
- NodeState empty = federatedNodeStore.getRoot();
+ NodeState empty = compositeNodeStore.getRoot();
NodeBuilder builder = globalStore.getRoot().builder();
builder.setProperty("global-prop-1", "val");
@@ -117,7 +117,7 @@ public class FederatedCompareTest {
libsBuilder.setProperty("libs-prop-2", "val");
libsStore.merge(libsBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- NodeState modified = federatedNodeStore.getRoot();
+ NodeState modified = compositeNodeStore.getRoot();
final Set<String> addedProperties = newHashSet();
modified.compareAgainstBaseState(empty, new DefaultNodeStateDiff() {
@@ -138,9 +138,9 @@ public class FederatedCompareTest {
List<MountedNodeStore> mounts = Lists.newArrayList();
mounts.add(new MountedNodeStore(mip.getMountByName("libs"), libsStore));
- FederatedNodeStore federatedNodeStore = new FederatedNodeStore(mip, globalStore, mounts);
+ CompositeNodeStore compositeNodeStore = new CompositeNodeStore(mip, globalStore, mounts);
- NodeState empty = federatedNodeStore.getRoot();
+ NodeState empty = compositeNodeStore.getRoot();
NodeBuilder builder = globalStore.getRoot().builder();
builder.child("global-child-1");
@@ -153,7 +153,7 @@ public class FederatedCompareTest {
libsBuilder.child("libs-child-2");
libsStore.merge(libsBuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- NodeState modified = federatedNodeStore.getRoot();
+ NodeState modified = compositeNodeStore.getRoot();
final Set<String> addedChildren = newHashSet();
modified.compareAgainstBaseState(empty, new DefaultNodeStateDiff() {
Copied: jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiffTest.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiffTest.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiffTest.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiffTest.java Fri May 12 11:00:35 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
Copied: jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/MountInfoProviderServiceTest.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/MountInfoProviderServiceTest.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/MountInfoProviderServiceTest.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/MountInfoProviderServiceTest.java Fri May 12 11:00:35 2017
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
import java.util.Collections;
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Fri May 12 11:00:35 2017
@@ -41,7 +41,7 @@
<module>oak-api</module>
<module>oak-core-spi</module>
<module>oak-store-spi</module>
- <module>oak-store-federated</module>
+ <module>oak-store-composite</module>
<module>oak-blob-plugins</module>
<module>oak-blob</module>