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 [1/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/...
Author: tomekr
Date: Fri May 12 11:00:35 2017
New Revision: 1794954
URL: http://svn.apache.org/viewvc?rev=1794954&view=rev
Log:
OAK-6136: Extract the multiplexing implementation code into a separate bundle
Renamed the bundle to oak-store-composite.
Added:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeMemoryStoreFixture.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreBuilderTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeSegmentStoreFixture.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProviderTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java
jackrabbit/oak/trunk/oak-store-composite/
jackrabbit/oak/trunk/oak-store-composite/pom.xml
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/pom.xml
jackrabbit/oak/trunk/oak-store-composite/src/
jackrabbit/oak/trunk/oak-store-composite/src/main/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeState.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CopyOnReadIdentityMap.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiff.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountInfoProviderService.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountedNodeStore.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java
jackrabbit/oak/trunk/oak-store-composite/src/test/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeCompareTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiffTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/MountInfoProviderServiceTest.java
- copied, changed from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java
Removed:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java
jackrabbit/oak/trunk/oak-store-federated/pom.xml
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java
Modified:
jackrabbit/oak/trunk/oak-benchmarks/pom.xml
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
jackrabbit/oak/trunk/oak-it-osgi/pom.xml
jackrabbit/oak/trunk/oak-it/pom.xml
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
jackrabbit/oak/trunk/oak-pojosr/pom.xml
jackrabbit/oak/trunk/pom.xml
Modified: jackrabbit/oak/trunk/oak-benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/pom.xml Fri May 12 11:00:35 2017
@@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-federated</artifactId>
+ <artifactId>oak-store-composite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java Fri May 12 11:00:35 2017
@@ -160,7 +160,7 @@ public class BenchmarkRunner {
OptionSpec<Boolean> transientWrites = parser.accepts("transient", "Do not save data.")
.withOptionalArg().ofType(Boolean.class)
.defaultsTo(Boolean.FALSE);
- OptionSpec<Integer> mounts = parser.accepts("mounts", "Number of mounts for the federated node store.")
+ OptionSpec<Integer> mounts = parser.accepts("mounts", "Number of mounts for the composite node store.")
.withOptionalArg().ofType(Integer.class).defaultsTo(2);
OptionSpec<Integer> pathsPerMount = parser.accepts("pathsPerMount", "Number of paths per one mount.")
.withOptionalArg().ofType(Integer.class).defaultsTo(1000);
@@ -208,9 +208,9 @@ public class BenchmarkRunner {
rdbjdbcpasswd.value(options), rdbjdbctableprefix.value(options),
dropDBAfterTest.value(options), cacheSize * MB, base.value(options),
fdsCache.value(options)),
- OakRepositoryFixture.getFederatedStore(base.value(options), 256, cacheSize,
+ OakRepositoryFixture.getCompositeStore(base.value(options), 256, cacheSize,
mmap.value(options), mounts.value(options), pathsPerMount.value(options)),
- OakRepositoryFixture.getFederatedMemoryStore(mounts.value(options), pathsPerMount.value(options))
+ OakRepositoryFixture.getCompositeMemoryStore(mounts.value(options), pathsPerMount.value(options))
};
Benchmark[] allBenchmarks = new Benchmark[] {
Copied: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java (from r1794953, jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java?p2=jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java&p1=jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/CompositeStoreFixture.java Fri May 12 11:00:35 2017
@@ -18,7 +18,7 @@
package org.apache.jackrabbit.oak.fixture;
import org.apache.jackrabbit.oak.Oak;
-import org.apache.jackrabbit.oak.federated.FederatedNodeStore;
+import org.apache.jackrabbit.oak.composite.CompositeNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
@@ -33,7 +33,7 @@ import java.io.IOException;
import static org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
-class FederatedFixture extends OakFixture {
+class CompositeStoreFixture extends OakFixture {
private final File base;
@@ -51,7 +51,7 @@ class FederatedFixture extends OakFixtur
private FileStore fileStore;
- public FederatedFixture(String name, int mounts, int pathsPerMount) {
+ public CompositeStoreFixture(String name, int mounts, int pathsPerMount) {
super(name);
this.inMemory = true;
this.mounts = mounts;
@@ -63,8 +63,8 @@ class FederatedFixture extends OakFixtur
this.memoryMapping = false;
}
- public FederatedFixture(String name, File base, int maxFileSizeMB, int cacheSizeMB,
- boolean memoryMapping, int mounts, int pathsPerMount) {
+ public CompositeStoreFixture(String name, File base, int maxFileSizeMB, int cacheSizeMB,
+ boolean memoryMapping, int mounts, int pathsPerMount) {
super(name);
this.base = base;
this.maxFileSizeMB = maxFileSizeMB;
@@ -86,7 +86,7 @@ class FederatedFixture extends OakFixtur
}
mip.readOnlyMount("custom-mount-" + i, paths);
}
- FederatedNodeStore.Builder builder = new FederatedNodeStore.Builder(mip.build(), nodeStore);
+ CompositeNodeStore.Builder builder = new CompositeNodeStore.Builder(mip.build(), nodeStore);
for (int i = 0; i < mounts; i++) {
builder.addMount("custom-mount-" + i, nodeStore);
}
Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java Fri May 12 11:00:35 2017
@@ -49,8 +49,8 @@ public abstract class OakFixture {
public static final String OAK_SEGMENT_TAR = "Oak-Segment-Tar";
public static final String OAK_SEGMENT_TAR_DS = "Oak-Segment-Tar-DS";
- public static final String OAK_FEDERATED_STORE = "Oak-Federated";
- public static final String OAK_FEDERATED_MEMORY_STORE = "Oak-Federated-Memory";
+ public static final String OAK_COMPOSITE_STORE = "Oak-Composite-Store";
+ public static final String OAK_COMPOSITE_MEMORY_STORE = "Oak-Composite-Memory-Store";
private final String name;
@@ -262,14 +262,14 @@ public abstract class OakFixture {
return new SegmentTarFixture(name, base, maxFileSizeMB, cacheSizeMB, memoryMapping, useBlobStore, dsCacheInMB);
}
- public static OakFixture getFederatedStore(final String name, final File base,
+ public static OakFixture getCompositeStore(final String name, final File base,
final int maxFileSizeMB, final int cacheSizeMB, final boolean memoryMapping,
final int mounts, final int pathsPerMount) {
- return new FederatedFixture(name, base, maxFileSizeMB, cacheSizeMB, memoryMapping, mounts, pathsPerMount);
+ return new CompositeStoreFixture(name, base, maxFileSizeMB, cacheSizeMB, memoryMapping, mounts, pathsPerMount);
}
- public static OakFixture getFederatedMemoryStore(final String name, final int mounts, final int pathsPerMount) {
- return new FederatedFixture(name, mounts, pathsPerMount);
+ public static OakFixture getCompositeMemoryStore(final String name, final int mounts, final int pathsPerMount) {
+ return new CompositeStoreFixture(name, mounts, pathsPerMount);
}
public static class MongoFixture extends OakFixture {
Modified: jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java Fri May 12 11:00:35 2017
@@ -108,14 +108,14 @@ public class OakRepositoryFixture implem
memoryMapping, true, dsCacheInMB));
}
- public static RepositoryFixture getFederatedStore(File base, int maxFileSizeMB, int cacheSizeMB,
+ public static RepositoryFixture getCompositeStore(File base, int maxFileSizeMB, int cacheSizeMB,
final boolean memoryMapping, int mounts, int pathsPerMount) {
- return new OakRepositoryFixture(OakFixture.getFederatedStore(OakFixture.OAK_FEDERATED_STORE,
+ return new OakRepositoryFixture(OakFixture.getCompositeStore(OakFixture.OAK_COMPOSITE_STORE,
base, maxFileSizeMB, cacheSizeMB, memoryMapping, mounts, pathsPerMount));
}
- public static RepositoryFixture getFederatedMemoryStore(int mounts, int pathsPerMount) {
- return new OakRepositoryFixture(OakFixture.getFederatedMemoryStore(OakFixture.OAK_FEDERATED_MEMORY_STORE, mounts, pathsPerMount));
+ public static RepositoryFixture getCompositeMemoryStore(int mounts, int pathsPerMount) {
+ return new OakRepositoryFixture(OakFixture.getCompositeMemoryStore(OakFixture.OAK_COMPOSITE_MEMORY_STORE, mounts, pathsPerMount));
}
private final OakFixture oakFixture;
Modified: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java Fri May 12 11:00:35 2017
@@ -43,7 +43,7 @@ public final class FixturesHelper {
* default fixtures when no {@code nsfixtures} is provided
*/
public enum Fixture {
- DOCUMENT_NS, @Deprecated SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM, SEGMENT_TAR, FEDERATED_SEGMENT, FEDERATED_MEM
+ DOCUMENT_NS, @Deprecated SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM, SEGMENT_TAR, COMPOSITE_SEGMENT, COMPOSITE_MEM
}
private static final Set<Fixture> FIXTURES;
Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Fri May 12 11:00:35 2017
@@ -168,7 +168,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-federated</artifactId>
+ <artifactId>oak-store-composite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/pom.xml Fri May 12 11:00:35 2017
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-federated</artifactId>
+ <artifactId>oak-store-composite</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-it-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/pom.xml Fri May 12 11:00:35 2017
@@ -113,7 +113,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-federated</artifactId>
+ <artifactId>oak-store-composite</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Fri May 12 11:00:35 2017
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-federated</artifactId>
+ <artifactId>oak-store-composite</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java Fri May 12 11:00:35 2017
@@ -28,8 +28,8 @@ import org.apache.jackrabbit.oak.fixture
import org.apache.jackrabbit.oak.fixture.DocumentRdbFixture;
import org.apache.jackrabbit.oak.fixture.MemoryFixture;
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
-import org.apache.jackrabbit.oak.federated.FederatedMemoryFixture;
-import org.apache.jackrabbit.oak.federated.FederatedSegmentFixture;
+import org.apache.jackrabbit.oak.composite.CompositeMemoryStoreFixture;
+import org.apache.jackrabbit.oak.composite.CompositeSegmentStoreFixture;
import org.apache.jackrabbit.oak.segment.fixture.SegmentTarFixture;
public class NodeStoreFixtures {
@@ -44,9 +44,9 @@ public class NodeStoreFixtures {
public static final NodeStoreFixture DOCUMENT_MEM = new DocumentMemoryFixture();
- public static final NodeStoreFixture FEDERATED_SEGMENT = new FederatedSegmentFixture();
+ public static final NodeStoreFixture COMPOSITE_SEGMENT = new CompositeSegmentStoreFixture();
- public static final NodeStoreFixture FEDERATED_MEM = new FederatedMemoryFixture();
+ public static final NodeStoreFixture COMPOSITE_MEM = new CompositeMemoryStoreFixture();
public static Collection<Object[]> asJunitParameters(Set<FixturesHelper.Fixture> fixtures) {
List<NodeStoreFixture> configuredFixtures = new ArrayList<NodeStoreFixture>();
@@ -65,11 +65,11 @@ public class NodeStoreFixtures {
if (fixtures.contains(FixturesHelper.Fixture.SEGMENT_TAR)) {
configuredFixtures.add(SEGMENT_TAR);
}
- if (fixtures.contains(FixturesHelper.Fixture.FEDERATED_SEGMENT)) {
- configuredFixtures.add(FEDERATED_SEGMENT);
+ if (fixtures.contains(FixturesHelper.Fixture.COMPOSITE_SEGMENT)) {
+ configuredFixtures.add(COMPOSITE_SEGMENT);
}
- if (fixtures.contains(FixturesHelper.Fixture.FEDERATED_MEM)) {
- configuredFixtures.add(FEDERATED_MEM);
+ if (fixtures.contains(FixturesHelper.Fixture.COMPOSITE_MEM)) {
+ configuredFixtures.add(COMPOSITE_MEM);
}
Collection<Object[]> result = new ArrayList<Object[]>();
Copied: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeMemoryStoreFixture.java (from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeMemoryStoreFixture.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeMemoryStoreFixture.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeMemoryStoreFixture.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.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.oak.spi.mou
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-public class FederatedMemoryFixture extends NodeStoreFixture {
+public class CompositeMemoryStoreFixture extends NodeStoreFixture {
private static final String MOUNT_PATH = "/tmp";
@@ -37,7 +37,7 @@ public class FederatedMemoryFixture exte
NodeStore globalStore = new MemoryNodeStore();
NodeStore tempMount = new MemoryNodeStore();
- return new FederatedNodeStore.Builder(mip, globalStore).addMount("temp", tempMount).build();
+ return new CompositeNodeStore.Builder(mip, globalStore).addMount("temp", tempMount).build();
}
@Override
Copied: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreBuilderTest.java (from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreBuilderTest.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreBuilderTest.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreBuilderTest.java Fri May 12 11:00:35 2017
@@ -16,14 +16,14 @@
* 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.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.junit.Test;
-public class FederatedNodeStoreBuilderTest {
+public class CompositeNodeStoreBuilderTest {
@Test(expected = IllegalArgumentException.class)
public void builderRejectsTooManyReadWriteStores_oneExtra() {
@@ -31,7 +31,7 @@ public class FederatedNodeStoreBuilderTe
.mount("temp", "/tmp")
.build();
- new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
+ new CompositeNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("temp", new MemoryNodeStore())
.build();
}
@@ -43,7 +43,7 @@ public class FederatedNodeStoreBuilderTe
.readOnlyMount("readOnly", "/readOnly")
.build();
- new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
+ new CompositeNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("temp", new MemoryNodeStore())
.addMount("readOnly", new MemoryNodeStore())
.build();
@@ -56,7 +56,7 @@ public class FederatedNodeStoreBuilderTe
.readOnlyMount("readOnly2", "/readOnly2")
.build();
- new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
+ new CompositeNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("readOnly", new MemoryNodeStore())
.addMount("readOnly2", new MemoryNodeStore())
.build();
@@ -68,7 +68,7 @@ public class FederatedNodeStoreBuilderTe
.mount("temp", "/tmp")
.build();
- new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
+ new CompositeNodeStore.Builder(mip, new MemoryNodeStore())
.build();
}
@@ -78,7 +78,7 @@ public class FederatedNodeStoreBuilderTe
.mount("temp", "/tmp")
.build();
- new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
+ new CompositeNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("not-temp", new MemoryNodeStore())
.build();
}
Copied: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java (from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.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 static com.google.common.base.Predicates.compose;
import static com.google.common.collect.Iterables.filter;
@@ -82,14 +82,14 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class FederatedNodeStoreTest {
+public class CompositeNodeStoreTest {
private final NodeStoreKind root;
private final NodeStoreKind mounts;
private final List<NodeStoreRegistration> registrations = newArrayList();
- private FederatedNodeStore store;
+ private CompositeNodeStore store;
private NodeStore globalStore;
private NodeStore mountedStore;
private NodeStore deepMountedStore;
@@ -105,7 +105,7 @@ public class FederatedNodeStoreTest {
});
}
- public FederatedNodeStoreTest(NodeStoreKind root, NodeStoreKind mounts) {
+ public CompositeNodeStoreTest(NodeStoreKind root, NodeStoreKind mounts) {
this.root = root;
this.mounts = mounts;
}
@@ -179,7 +179,7 @@ public class FederatedNodeStoreTest {
nonDefaultStores.add(new MountedNodeStore(mip.getMountByName("deep"), deepMountedStore));
nonDefaultStores.add(new MountedNodeStore(mip.getMountByName("empty"), emptyStore));
nonDefaultStores.add(new MountedNodeStore(mip.getMountByName("readOnly"), readOnlyStore));
- store = new FederatedNodeStore(mip, globalStore, nonDefaultStores);
+ store = new CompositeNodeStore(mip, globalStore, nonDefaultStores);
}
@After
@@ -227,7 +227,7 @@ public class FederatedNodeStoreTest {
}
@Test
- public void childNodeEntryForMountIsFederated() {
+ public void childNodeEntryForMountIsComposite() {
ChildNodeEntry libsNode = Iterables.find(store.getRoot().getChildNodeEntries(), new Predicate<ChildNodeEntry>() {
@Override
@@ -334,7 +334,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertThat("Property must be visible in federated store",
+ assertThat("Property must be visible in composite store",
store.getRoot().getProperty("newProp").getValue(Type.STRING), equalTo("newValue"));
assertThat("Property must be visible in owning (root) store",
@@ -349,7 +349,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Property must be removed from federated store", store.getRoot().hasProperty("prop"));
+ assertFalse("Property must be removed from composite store", store.getRoot().hasProperty("prop"));
assertFalse("Property must be removed from owning (root) store", globalStore.getRoot().hasProperty("prop"));
}
@@ -361,7 +361,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertTrue("Node must be added to federated store", store.getRoot().hasChildNode("newNode"));
+ assertTrue("Node must be added to composite store", store.getRoot().hasChildNode("newNode"));
assertTrue("Node must be added to owning (root) store", globalStore.getRoot().hasChildNode("newNode"));
}
@@ -374,7 +374,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertTrue("Node must be added to federated store", store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ assertTrue("Node must be added to composite store", store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
assertTrue("Node must be added to owning (mounted) store", mountedStore.getRoot().getChildNode("tmp").hasChildNode("newNode"));
}
@@ -386,7 +386,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node must be removed from the federated store", store.getRoot().hasChildNode("apps"));
+ assertFalse("Node must be removed from the composite store", store.getRoot().hasChildNode("apps"));
assertFalse("Node must be removed from the owning (root) store", globalStore.getRoot().hasChildNode("apps"));
}
@@ -399,7 +399,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertTrue("Node must be added to federated store", store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ assertTrue("Node must be added to composite store", store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
builder = store.getRoot().builder();
@@ -407,8 +407,8 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node must be removed from the federated store", store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
- assertFalse("Node must be removed from the owning (federated) store", globalStore.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ assertFalse("Node must be removed from the composite store", store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ assertFalse("Node must be removed from the owning (composite) store", globalStore.getRoot().getChildNode("tmp").hasChildNode("newNode"));
}
@Test
@@ -497,10 +497,10 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node apps must have no properties (federated store)", store.getRoot().getChildNode("apps").hasProperty("prop"));
+ assertFalse("Node apps must have no properties (composite store)", store.getRoot().getChildNode("apps").hasProperty("prop"));
assertFalse("Node apps must have no properties (root store)", globalStore.getRoot().getChildNode("apps").hasProperty("prop"));
- assertTrue("Node /apps/child1 must exist (federated store)", store.getRoot().getChildNode("apps").hasChildNode("child1"));
+ assertTrue("Node /apps/child1 must exist (composite store)", store.getRoot().getChildNode("apps").hasChildNode("child1"));
assertTrue("Node /apps/child1 must exist (root store)", globalStore.getRoot().getChildNode("apps").hasChildNode("child1"));
}
@@ -514,10 +514,10 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node tmp must have no properties (federated store)", store.getRoot().getChildNode("tmp").hasProperty("prop1"));
+ assertFalse("Node tmp must have no properties (composite store)", store.getRoot().getChildNode("tmp").hasProperty("prop1"));
assertFalse("Node tmp must have no properties (mounted store)", mountedStore.getRoot().getChildNode("tmp").hasProperty("prop1"));
- assertTrue("Node /tmp/build3 must exist (federated store)", store.getRoot().getChildNode("tmp").hasChildNode("child3"));
+ assertTrue("Node /tmp/build3 must exist (composite store)", store.getRoot().getChildNode("tmp").hasChildNode("child3"));
assertTrue("Node /tmp/child3 must exist (mounted store)", mountedStore.getRoot().getChildNode("tmp").hasChildNode("child3"));
}
@@ -596,7 +596,7 @@ public class FederatedNodeStoreTest {
mountedStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
NodeState holderNode = store.getRoot().getChildNode("multi-holder");
- assertTrue("/multi-holder/oak:mount-temp should be visible from the federated store",
+ assertTrue("/multi-holder/oak:mount-temp should be visible from the composite store",
holderNode.hasChildNode("oak:mount-temp"));
assertChildNodeNames(holderNode, "oak:mount-temp");
@@ -617,7 +617,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertFalse("/src must no longer exist", store.getRoot().hasChildNode("src"));
- assertTrue("/dst/src must exist (federated store)", store.getRoot().getChildNode("dst").hasChildNode("src"));
+ assertTrue("/dst/src must exist (composite store)", store.getRoot().getChildNode("dst").hasChildNode("src"));
}
@Test
@@ -633,7 +633,7 @@ public class FederatedNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertFalse("/src must no longer exist", store.getRoot().hasChildNode("src"));
- assertTrue("/tmp/src must exist (federated store)", store.getRoot().getChildNode("tmp").hasChildNode("src"));
+ assertTrue("/tmp/src must exist (composite store)", store.getRoot().getChildNode("tmp").hasChildNode("src"));
}
Copied: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeSegmentStoreFixture.java (from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeSegmentStoreFixture.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeSegmentStoreFixture.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeSegmentStoreFixture.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 java.io.IOException;
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.spi.mou
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-public class FederatedSegmentFixture extends NodeStoreFixture {
+public class CompositeSegmentStoreFixture extends NodeStoreFixture {
private static final String MOUNT_PATH = "/tmp";
@@ -41,7 +41,7 @@ public class FederatedSegmentFixture ext
NodeStore globalStore = SegmentNodeStoreBuilders.builder(new MemoryStore()).build();
NodeStore tempMount = SegmentNodeStoreBuilders.builder(new MemoryStore()).build();
- return new FederatedNodeStore.Builder(mip, globalStore).addMount("temp", tempMount).build();
+ return new CompositeNodeStore.Builder(mip, globalStore).addMount("temp", tempMount).build();
} catch (IOException e) {
throw new RuntimeException();
}
Copied: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProviderTest.java (from r1794953, jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProviderTest.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProviderTest.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProviderTest.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 org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java Fri May 12 11:00:35 2017
@@ -457,7 +457,7 @@ public class NodeStoreTest extends OakBa
NodeBuilder test = store.getRoot().builder().getChildNode("test");
NodeBuilder x = test.getChildNode("x");
if (fixture == NodeStoreFixtures.SEGMENT_TAR || fixture == NodeStoreFixtures.MEMORY_NS
- || fixture == NodeStoreFixtures.FEDERATED_MEM || fixture == NodeStoreFixtures.FEDERATED_SEGMENT) {
+ || fixture == NodeStoreFixtures.COMPOSITE_MEM || fixture == NodeStoreFixtures.COMPOSITE_SEGMENT) {
assertTrue(x.moveTo(x, "xx"));
assertFalse(x.exists());
assertFalse(test.hasChildNode("x"));
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1794954&r1=1794953&r2=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Fri May 12 11:00:35 2017
@@ -253,7 +253,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-store-federated</artifactId>
+ <artifactId>oak-store-composite</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Copied: jackrabbit/oak/trunk/oak-store-composite/pom.xml (from r1794953, jackrabbit/oak/trunk/oak-store-federated/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/pom.xml?p2=jackrabbit/oak/trunk/oak-store-composite/pom.xml&p1=jackrabbit/oak/trunk/oak-store-federated/pom.xml&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-composite/pom.xml Fri May 12 11:00:35 2017
@@ -27,8 +27,8 @@
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
- <artifactId>oak-store-federated</artifactId>
- <name>Oak Federated Store</name>
+ <artifactId>oak-store-composite</artifactId>
+ <name>Oak Composite Store</name>
<packaging>bundle</packaging>
<build>
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeBuilder.java Fri May 12 11:00:35 2017
@@ -14,7 +14,7 @@
* See the License for the 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.base.Objects;
@@ -46,25 +46,25 @@ import static java.util.Collections.sing
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
-class FederatedNodeBuilder implements NodeBuilder {
+class CompositeNodeBuilder implements NodeBuilder {
private final String path;
- private final FederationContext ctx;
+ private final CompositionContext ctx;
private Map<MountedNodeStore, NodeBuilder> nodeBuilders;
private final MountedNodeStore owningStore;
- private final FederatedNodeBuilder parent;
+ private final CompositeNodeBuilder parent;
- private final FederatedNodeBuilder rootBuilder;
+ private final CompositeNodeBuilder rootBuilder;
- FederatedNodeBuilder(String path, Map<MountedNodeStore, NodeBuilder> nodeBuilders, FederationContext ctx) {
+ CompositeNodeBuilder(String path, Map<MountedNodeStore, NodeBuilder> nodeBuilders, CompositionContext ctx) {
this(path, nodeBuilders, ctx, null);
}
- private FederatedNodeBuilder(String path, Map<MountedNodeStore, NodeBuilder> nodeBuilders, FederationContext ctx, FederatedNodeBuilder parent) {
+ private CompositeNodeBuilder(String path, Map<MountedNodeStore, NodeBuilder> nodeBuilders, CompositionContext ctx, CompositeNodeBuilder parent) {
checkArgument(nodeBuilders.size() == ctx.getStoresCount(), "Got %s builders but the context manages %s stores", nodeBuilders.size(), ctx.getStoresCount());
this.path = path;
this.ctx = ctx;
@@ -84,12 +84,12 @@ class FederatedNodeBuilder implements No
@Override
public NodeState getNodeState() {
- return new FederatedNodeState(path, new IdentityHashMap<>(buildersToNodeStates(nodeBuilders)), ctx);
+ return new CompositeNodeState(path, new IdentityHashMap<>(buildersToNodeStates(nodeBuilders)), ctx);
}
@Override
public NodeState getBaseState() {
- return new FederatedNodeState(path, buildersToBaseStates(nodeBuilders), ctx);
+ return new CompositeNodeState(path, buildersToBaseStates(nodeBuilders), ctx);
}
private static Map<MountedNodeStore, NodeState> buildersToNodeStates(Map<MountedNodeStore, NodeBuilder> builders) {
@@ -209,7 +209,7 @@ class FederatedNodeBuilder implements No
return this;
}
- // child-related methods, require federation
+ // child-related methods, require composition
@Override
public long getChildNodeCount(final long max) {
List<MountedNodeStore> contributingStores = ctx.getContributingStoresForBuilders(path, nodeBuilders);
@@ -219,12 +219,12 @@ class FederatedNodeBuilder implements No
return getWrappedNodeBuilder().getChildNodeCount(max);
} else {
// Count the children in each contributing store.
- return FederatedNodeState.accumulateChildSizes(concat(transform(contributingStores, new Function<MountedNodeStore, Iterable<String>>() {
+ return CompositeNodeState.accumulateChildSizes(concat(transform(contributingStores, new Function<MountedNodeStore, Iterable<String>>() {
@Override
public Iterable<String> apply(MountedNodeStore input) {
NodeBuilder contributing = nodeBuilders.get(input);
if (contributing.getChildNodeCount(max) == MAX_VALUE) {
- return singleton(FederatedNodeState.STOP_COUNTING_CHILDREN);
+ return singleton(CompositeNodeState.STOP_COUNTING_CHILDREN);
} else {
return filter(contributing.getChildNodeNames(), ctx.belongsToStore(input, path));
}
@@ -273,7 +273,7 @@ class FederatedNodeBuilder implements No
@Override
public NodeBuilder getChildNode(final String name) {
String childPath = simpleConcat(path, name);
- if (!ctx.shouldBeFederated(childPath)) {
+ if (!ctx.shouldBeComposite(childPath)) {
return nodeBuilders.get(ctx.getOwningStore(childPath)).getChildNode(name);
}
Map<MountedNodeStore, NodeBuilder> newNodeBuilders = transformValues(nodeBuilders, new Function<NodeBuilder, NodeBuilder>() {
@@ -282,7 +282,7 @@ class FederatedNodeBuilder implements No
return input.getChildNode(name);
}
});
- return new FederatedNodeBuilder(childPath, newNodeBuilders, ctx, this);
+ return new CompositeNodeBuilder(childPath, newNodeBuilders, ctx, this);
}
@Override
@@ -299,7 +299,7 @@ class FederatedNodeBuilder implements No
createAncestors(childStore);
}
final NodeBuilder childBuilder = nodeBuilders.get(childStore).setChildNode(name, nodeState);
- if (!ctx.shouldBeFederated(childPath)) {
+ if (!ctx.shouldBeComposite(childPath)) {
return childBuilder;
}
@@ -313,7 +313,7 @@ class FederatedNodeBuilder implements No
}
}
});
- return new FederatedNodeBuilder(childPath, newNodeBuilders, ctx, this);
+ return new CompositeNodeBuilder(childPath, newNodeBuilders, ctx, this);
}
@Override
@@ -359,7 +359,7 @@ class FederatedNodeBuilder implements No
private final String getSourcePath() {
// Traverse up the hierarchy until we encounter the first builder
// having a source path annotation or until we hit the root
- FederatedNodeBuilder builder = this;
+ CompositeNodeBuilder builder = this;
String sourcePath = getSourcePathAnnotation(builder);
while (sourcePath == null && builder.parent != null) {
builder = builder.parent;
@@ -379,7 +379,7 @@ class FederatedNodeBuilder implements No
}
}
- private static String getSourcePathAnnotation(FederatedNodeBuilder builder) {
+ private static String getSourcePathAnnotation(CompositeNodeBuilder builder) {
PropertyState base = builder.getBaseState().getProperty(MoveDetector.SOURCE_PATH);
PropertyState head = builder.getNodeState().getProperty(MoveDetector.SOURCE_PATH);
if (Objects.equal(base, head)) {
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeState.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeState.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeState.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeState.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 org.apache.jackrabbit.oak.api.PropertyState;
@@ -39,35 +39,35 @@ import static com.google.common.collect.
import static com.google.common.collect.Maps.transformValues;
import static java.lang.Long.MAX_VALUE;
import static java.util.Collections.singleton;
-import static org.apache.jackrabbit.oak.federated.FederatedNodeBuilder.simpleConcat;
+import static org.apache.jackrabbit.oak.composite.CompositeNodeBuilder.simpleConcat;
import static org.apache.jackrabbit.oak.spi.state.ChildNodeEntry.GET_NAME;
-class FederatedNodeState extends AbstractNodeState {
+class CompositeNodeState extends AbstractNodeState {
// A note on content held by node stores which is outside the mount boundaries
//
// As a matter of design, mounted stores will definitely hold information _above_
// their mounted, path, e.g. a store mounted at /a/b/c will definitely have nodes
- // /a and /a/b, which will not be visible through the federated node store.
+ // /a and /a/b, which will not be visible through the composite node store.
//
// If a node store holds information _below_ a path which belongs to another
- // repository, the federated node store will not consider that information.
+ // repository, the composite node store will not consider that information.
//
// For instance, with a node store mounted at /libs and the root store
// having a node at /libs/food, both the /libs and /libs/foo nodes from
// the root store will be ignored
- static final String STOP_COUNTING_CHILDREN = new String(FederatedNodeState.class.getName() + ".stopCountingChildren");
+ static final String STOP_COUNTING_CHILDREN = new String(CompositeNodeState.class.getName() + ".stopCountingChildren");
private final String path;
- private final FederationContext ctx;
+ private final CompositionContext ctx;
private final MountedNodeStore owningStore;
private final Map<MountedNodeStore, NodeState> nodeStates;
- FederatedNodeState(String path, Map<MountedNodeStore, NodeState> nodeStates, FederationContext ctx) {
+ CompositeNodeState(String path, Map<MountedNodeStore, NodeState> nodeStates, CompositionContext ctx) {
checkArgument(nodeStates.size() == ctx.getStoresCount(), "Got %s node states but the context manages %s stores", nodeStates.size(), ctx.getStoresCount());
this.path = path;
this.ctx = ctx;
@@ -112,7 +112,7 @@ class FederatedNodeState extends Abstrac
@Override
public NodeState getChildNode(final String name) {
String childPath = simpleConcat(path, name);
- if (!ctx.shouldBeFederated(childPath)) {
+ if (!ctx.shouldBeComposite(childPath)) {
return nodeStates.get(ctx.getOwningStore(childPath)).getChildNode(name);
}
Map<MountedNodeStore, NodeState> newNodeStates = transformValues(nodeStates, new Function<NodeState, NodeState>() {
@@ -121,7 +121,7 @@ class FederatedNodeState extends Abstrac
return input.getChildNode(name);
}
});
- return new FederatedNodeState(childPath, newNodeStates, ctx);
+ return new CompositeNodeState(childPath, newNodeStates, ctx);
}
@Override
@@ -177,8 +177,8 @@ class FederatedNodeState extends Abstrac
@Override
public boolean compareAgainstBaseState(NodeState base, NodeStateDiff diff) {
- if (base instanceof FederatedNodeState) {
- FederatedNodeState multiBase = (FederatedNodeState) base;
+ if (base instanceof CompositeNodeState) {
+ CompositeNodeState multiBase = (CompositeNodeState) base;
NodeStateDiff wrappingDiff = new WrappingDiff(diff, multiBase);
boolean full = getWrappedNodeState().compareAgainstBaseState(multiBase.getWrappedNodeState(), new ChildrenDiffFilter(wrappingDiff, owningStore, true));
for (MountedNodeStore mns : ctx.getContributingStoresForNodes(path, nodeStates)) {
@@ -205,7 +205,7 @@ class FederatedNodeState extends Abstrac
return input.builder();
}
});
- return new FederatedNodeBuilder(path, nodeBuilders, ctx);
+ return new CompositeNodeBuilder(path, nodeBuilders, ctx);
}
private NodeState getWrappedNodeState() {
@@ -289,9 +289,9 @@ class FederatedNodeState extends Abstrac
private final NodeStateDiff diff;
- private final FederatedNodeState base;
+ private final CompositeNodeState base;
- public WrappingDiff(NodeStateDiff diff, FederatedNodeState base) {
+ public WrappingDiff(NodeStateDiff diff, CompositeNodeState base) {
this.diff = diff;
this.base = base;
}
@@ -331,7 +331,7 @@ class FederatedNodeState extends Abstrac
}
private NodeState wrapAfter(String name) {
- return FederatedNodeState.this.getChildNode(name);
+ return CompositeNodeState.this.getChildNode(name);
}
}
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java Fri May 12 11:00:35 2017
@@ -14,7 +14,7 @@
* See the License for the 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.Predicate;
import com.google.common.base.Predicates;
@@ -60,7 +60,7 @@ import static com.google.common.collect.
import static com.google.common.collect.Sets.filter;
import static com.google.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAncestor;
-import static org.apache.jackrabbit.oak.federated.ModifiedPathDiff.getModifiedPaths;
+import static org.apache.jackrabbit.oak.composite.ModifiedPathDiff.getModifiedPaths;
/**
* A {@link NodeStore} implementation that combines other {@link NodeStore} instances
@@ -68,11 +68,11 @@ import static org.apache.jackrabbit.oak.
*
* <p>The main objective of this implementation is to proxy operations working on
* at most single read-write store with any number of read-only stores. While the
- * federation would technically work at the NodeStore level there are several
+ * composition would technically work at the NodeStore level there are several
* less-than-obvious issues which prevent it:
* <ol>
* <li>Thread safety of the write operation can be quite costly, and will come on top
- * of the thread safety measures already put in place by the federated node stores.</li>
+ * of the thread safety measures already put in place by the composite node stores.</li>
* <li>Many JCR subsystems require global state, e.g. the versioning store. This global state
* can become corrupt if multiple mounts operate on it or if mounts are added and removed.</li>
* </ol>
@@ -80,35 +80,35 @@ import static org.apache.jackrabbit.oak.
* <p>As such, the only supported configuration is at most a single write-enabled store.
*
* <p>Because of the limitation described above, right now the only correct way to use
- * FederatedNodeStore is to create a normal repository, split it into parts
+ * CompositeNodeStore is to create a normal repository, split it into parts
* using oak-upgrade {@code --{include,exclude}-paths} and then configure this
- * node store implementation to federate split parts together.
+ * node store implementation to composite split parts together.
*/
-public class FederatedNodeStore implements NodeStore, Observable {
+public class CompositeNodeStore implements NodeStore, Observable {
- private static final Logger LOG = LoggerFactory.getLogger(FederatedNodeStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeNodeStore.class);
- private static final String CHECKPOINT_ID_PREFIX = "federated.checkpoint.";
+ private static final String CHECKPOINT_ID_PREFIX = "composite.checkpoint.";
private final TreeSet<String> ignoreReadOnlyWritePaths;
- final FederationContext ctx;
+ final CompositionContext ctx;
private final List<Observer> observers = new CopyOnWriteArrayList<>();
// visible for testing only
- FederatedNodeStore(MountInfoProvider mip, NodeStore globalStore, List<MountedNodeStore> nonDefaultStore) {
+ CompositeNodeStore(MountInfoProvider mip, NodeStore globalStore, List<MountedNodeStore> nonDefaultStore) {
this(mip, globalStore, nonDefaultStore, Collections.<String>emptyList());
}
- FederatedNodeStore(MountInfoProvider mip, NodeStore globalStore, List<MountedNodeStore> nonDefaultStore, List<String> ignoreReadOnlyWritePaths) {
- this.ctx = new FederationContext(mip, globalStore, nonDefaultStore);
+ CompositeNodeStore(MountInfoProvider mip, NodeStore globalStore, List<MountedNodeStore> nonDefaultStore, List<String> ignoreReadOnlyWritePaths) {
+ this.ctx = new CompositionContext(mip, globalStore, nonDefaultStore);
this.ignoreReadOnlyWritePaths = new TreeSet<>(ignoreReadOnlyWritePaths);
}
@Override
public NodeState getRoot() {
- // the federated root state exposes the node states as they are
+ // the composite root state exposes the node states as they are
// at this certain point in time, so we eagerly retrieve them from all stores
Map<MountedNodeStore, NodeState> nodeStates = newHashMap();
for (MountedNodeStore nodeStore : ctx.getAllMountedNodeStores()) {
@@ -119,8 +119,8 @@ public class FederatedNodeStore implemen
@Override
public NodeState merge(NodeBuilder builder, CommitHook commitHook, CommitInfo info) throws CommitFailedException {
- checkArgument(builder instanceof FederatedNodeBuilder);
- FederatedNodeBuilder nodeBuilder = (FederatedNodeBuilder) builder;
+ checkArgument(builder instanceof CompositeNodeBuilder);
+ CompositeNodeBuilder nodeBuilder = (CompositeNodeBuilder) builder;
if (!PathUtils.denotesRoot(nodeBuilder.getPath())) {
throw new IllegalArgumentException();
}
@@ -139,14 +139,14 @@ public class FederatedNodeStore implemen
NodeState result = nodeStore.merge(partialBuilder, EmptyHook.INSTANCE, info);
resultStates.put(mountedNodeStore, result);
}
- FederatedNodeState newRoot = createRootNodeState(resultStates);
+ CompositeNodeState newRoot = createRootNodeState(resultStates);
for (Observer observer : observers) {
observer.contentChanged(newRoot, info);
}
return newRoot;
}
- private void assertNoChangesOnReadOnlyMounts(FederatedNodeBuilder nodeBuilder) throws CommitFailedException {
+ private void assertNoChangesOnReadOnlyMounts(CompositeNodeBuilder nodeBuilder) throws CommitFailedException {
for (MountedNodeStore mountedNodeStore : ctx.getAllMountedNodeStores()) {
if (!mountedNodeStore.getMount().isReadOnly()) {
continue;
@@ -162,7 +162,7 @@ public class FederatedNodeStore implemen
}
Set<String> failingChangedPaths = difference(changedPaths, ignoredChangedPaths);
if (!failingChangedPaths.isEmpty()) {
- throw new CommitFailedException("FederatedStore", 31, "Unable to perform changes on read-only mount " + mountedNodeStore.getMount().getName() + ". Failing paths: " + failingChangedPaths.toString());
+ throw new CommitFailedException("CompositeStore", 31, "Unable to perform changes on read-only mount " + mountedNodeStore.getMount().getName() + ". Failing paths: " + failingChangedPaths.toString());
}
}
}
@@ -170,9 +170,9 @@ public class FederatedNodeStore implemen
@Override
public NodeState rebase(NodeBuilder builder) {
- checkArgument(builder instanceof FederatedNodeBuilder);
+ checkArgument(builder instanceof CompositeNodeBuilder);
- FederatedNodeBuilder nodeBuilder = (FederatedNodeBuilder) builder;
+ CompositeNodeBuilder nodeBuilder = (CompositeNodeBuilder) builder;
Map<MountedNodeStore, NodeState> resultStates = newHashMap();
for (MountedNodeStore mountedNodeStore : ctx.getAllMountedNodeStores()) {
NodeStore nodeStore = mountedNodeStore.getNodeStore();
@@ -185,9 +185,9 @@ public class FederatedNodeStore implemen
@Override
public NodeState reset(NodeBuilder builder) {
- checkArgument(builder instanceof FederatedNodeBuilder);
+ checkArgument(builder instanceof CompositeNodeBuilder);
- FederatedNodeBuilder nodeBuilder = (FederatedNodeBuilder) builder;
+ CompositeNodeBuilder nodeBuilder = (CompositeNodeBuilder) builder;
Map<MountedNodeStore, NodeState> resultStates = newHashMap();
for (MountedNodeStore mountedNodeStore : ctx.getAllMountedNodeStores()) {
NodeStore nodeStore = mountedNodeStore.getNodeStore();
@@ -198,8 +198,8 @@ public class FederatedNodeStore implemen
return createRootNodeState(resultStates);
}
- private FederatedNodeState createRootNodeState(Map<MountedNodeStore, NodeState> rootStates) {
- return new FederatedNodeState("/", rootStates, ctx);
+ private CompositeNodeState createRootNodeState(Map<MountedNodeStore, NodeState> rootStates) {
+ return new CompositeNodeState("/", rootStates, ctx);
}
@Override
@@ -224,12 +224,12 @@ public class FederatedNodeStore implemen
return filter(globalNodeStore.checkpoints(), new Predicate<String>() {
@Override
public boolean apply(String checkpoint) {
- return isFederatedCheckpoint(checkpoint);
+ return isCompositeCheckpoint(checkpoint);
}
});
}
- private boolean isFederatedCheckpoint(String checkpoint) {
+ private boolean isCompositeCheckpoint(String checkpoint) {
Map<String, String> props = ctx.getGlobalStore().getNodeStore().checkpointInfo(checkpoint);
if (props == null) {
return false;
@@ -297,7 +297,7 @@ public class FederatedNodeStore implemen
if (any(nodeStates.values(), isNull())) {
return null;
}
- return new FederatedNodeState("/", nodeStates, ctx);
+ return new CompositeNodeState("/", nodeStates, ctx);
}
@Override
@@ -403,10 +403,10 @@ public class FederatedNodeStore implemen
return this;
}
- public FederatedNodeStore build() {
+ public CompositeNodeStore build() {
checkReadWriteMountsNumber();
checkMountsAreConsistentWithMounts();
- return new FederatedNodeStore(mip, globalStore, nonDefaultStores, ignoreReadOnlyWritePaths);
+ return new CompositeNodeStore(mip, globalStore, nonDefaultStores, ignoreReadOnlyWritePaths);
}
private void checkReadWriteMountsNumber() {
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreService.java Fri May 12 11:00:35 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -47,13 +47,13 @@ import java.util.Map;
import java.util.Set;
@Component(policy = ConfigurationPolicy.REQUIRE)
-public class FederatedNodeStoreService {
+public class CompositeNodeStoreService {
- private static final Logger LOG = LoggerFactory.getLogger(FederatedNodeStoreService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeNodeStoreService.class);
- private static final String GLOBAL_ROLE = "federated:global";
+ private static final String GLOBAL_ROLE = "composite:global";
- private static final String MOUNT_ROLE_PREFIX = "federated:mount:";
+ private static final String MOUNT_ROLE_PREFIX = "composite:mount:";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, policy = ReferencePolicy.STATIC)
private MountInfoProvider mountInfoProvider;
@@ -79,15 +79,15 @@ public class FederatedNodeStoreService {
protected void activate(ComponentContext context, Map<String, ?> config) {
this.context = context;
ignoreReadOnlyWritePaths = PropertiesUtil.toStringArray(config.get(PROP_IGNORE_READ_ONLY_WRITES));
- registerFederatedNodeStore();
+ registerCompositeNodeStore();
}
@Deactivate
protected void deactivate() {
- unregisterFederatedNodeStore();
+ unregisterCompositeNodeStore();
}
- private void registerFederatedNodeStore() {
+ private void registerCompositeNodeStore() {
if (nsReg != null) {
return; // already registered
}
@@ -103,7 +103,7 @@ public class FederatedNodeStoreService {
}
if (globalNs == null) {
- LOG.info("Federated node store registration is deferred until there's a global node store registered in OSGi");
+ LOG.info("Composite node store registration is deferred until there's a global node store registered in OSGi");
return;
} else {
LOG.info("Found global node store: {}", getDescription(globalNs));
@@ -111,13 +111,13 @@ public class FederatedNodeStoreService {
for (Mount m : mountInfoProvider.getNonDefaultMounts()) {
if (!availableMounts.contains(m.getName())) {
- LOG.info("Federated node store registration is deferred until there's mount {} registered in OSGi", m.getName());
+ LOG.info("Composite node store registration is deferred until there's mount {} registered in OSGi", m.getName());
return;
}
}
LOG.info("Node stores for all configured mounts are available");
- FederatedNodeStore.Builder builder = new FederatedNodeStore.Builder(mountInfoProvider, globalNs.getNodeStoreProvider().getNodeStore());
+ CompositeNodeStore.Builder builder = new CompositeNodeStore.Builder(mountInfoProvider, globalNs.getNodeStoreProvider().getNodeStore());
for (String p : ignoreReadOnlyWritePaths) {
builder.addIgnoredReadOnlyWritePath(p);
}
@@ -134,15 +134,15 @@ public class FederatedNodeStoreService {
}
Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(Constants.SERVICE_PID, FederatedNodeStore.class.getName());
- props.put("oak.nodestore.description", new String[] { "nodeStoreType=federatedStore" } );
+ props.put(Constants.SERVICE_PID, CompositeNodeStore.class.getName());
+ props.put("oak.nodestore.description", new String[] { "nodeStoreType=compositeStore" } );
- FederatedNodeStore store = builder.build();
+ CompositeNodeStore store = builder.build();
observerTracker = new ObserverTracker(store);
observerTracker.start(context.getBundleContext());
- LOG.info("Registering the federated node store");
+ LOG.info("Registering the composite node store");
nsReg = context.getBundleContext().registerService(
new String[]{
@@ -168,9 +168,9 @@ public class FederatedNodeStoreService {
return PropertiesUtil.toString(ns.getProps().get("oak.nodestore.description"), ns.getNodeStoreProvider().getClass().toString());
}
- private void unregisterFederatedNodeStore() {
+ private void unregisterCompositeNodeStore() {
if (nsReg != null) {
- LOG.info("Unregistering the federated node store");
+ LOG.info("Unregistering the composite node store");
nsReg.unregister();
nsReg = null;
}
@@ -189,8 +189,8 @@ public class FederatedNodeStoreService {
return;
}
- unregisterFederatedNodeStore();
- registerFederatedNodeStore();
+ unregisterCompositeNodeStore();
+ registerCompositeNodeStore();
}
protected void unbindNodeStore(NodeStoreProvider ns) {
@@ -206,8 +206,8 @@ public class FederatedNodeStoreService {
return;
}
- unregisterFederatedNodeStore();
- registerFederatedNodeStore();
+ unregisterCompositeNodeStore();
+ registerCompositeNodeStore();
}
private static class NodeStoreWithProps {
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java Fri May 12 11:00:35 2017
@@ -14,7 +14,7 @@
* See the License for the 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.base.Predicate;
@@ -41,7 +41,7 @@ import static com.google.common.collect.
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
-class FederationContext {
+class CompositionContext {
private final MountInfoProvider mip;
@@ -51,7 +51,7 @@ class FederationContext {
private final Map<Mount, MountedNodeStore> nodeStoresByMount;
- FederationContext(MountInfoProvider mip, NodeStore globalStore, List<MountedNodeStore> nonDefaultStores) {
+ CompositionContext(MountInfoProvider mip, NodeStore globalStore, List<MountedNodeStore> nonDefaultStores) {
this.mip = mip;
this.globalStore = new MountedNodeStore(mip.getDefaultMount(), globalStore);
this.nonDefaultStores = nonDefaultStores;
@@ -98,7 +98,7 @@ class FederationContext {
});
}
- boolean shouldBeFederated(final String path) {
+ boolean shouldBeComposite(final String path) {
if (Iterables.tryFind(nonDefaultStores, new Predicate<MountedNodeStore>() {
@Override
public boolean apply(MountedNodeStore input) {
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CopyOnReadIdentityMap.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CopyOnReadIdentityMap.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CopyOnReadIdentityMap.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CopyOnReadIdentityMap.java Fri May 12 11:00:35 2017
@@ -14,7 +14,7 @@
* See the License for the 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;
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiff.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiff.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiff.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/ModifiedPathDiff.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.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeState;
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountInfoProviderService.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountInfoProviderService.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountInfoProviderService.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountInfoProviderService.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.ArrayList;
import java.util.List;
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountedNodeStore.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountedNodeStore.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountedNodeStore.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/MountedNodeStore.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.spi.mount.Mount;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
Copied: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java (from r1794953, jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java?p2=jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java&p1=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java&r1=1794953&r2=1794954&rev=1794954&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java Fri May 12 11:00:35 2017
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.federated;
+package org.apache.jackrabbit.oak.composite;
import org.apache.felix.scr.annotations.*;
import org.apache.jackrabbit.oak.api.CommitFailedException;