Author: tomekr
Date: Tue May 2 12:38:48 2017
New Revision: 1793482
URL: http://svn.apache.org/viewvc?rev=1793482&view=rev
Log:
OAK-6136: Extract the multiplexing implementation code into a separate bundle
Renamed the "multiplexing" to "federated" node store.
Added:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/MultiplexingFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingMemoryFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreBuilderTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingSegmentFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java
jackrabbit/oak/trunk/oak-store-federated/
jackrabbit/oak/trunk/oak-store-federated/pom.xml
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/pom.xml
jackrabbit/oak/trunk/oak-store-federated/src/
jackrabbit/oak/trunk/oak-store-federated/src/main/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/CopyOnReadIdentityMap.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeBuilder.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeState.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingContext.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiff.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountInfoProviderService.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderService.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/MountedNodeStore.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountedNodeStore.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProvider.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProvider.java
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/package-info.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/package-info.java
jackrabbit/oak/trunk/oak-store-federated/src/test/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedChildrenCountTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingChildrenCountTest.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/FederatedCompareTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingCompareTest.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiffTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiffTest.java
jackrabbit/oak/trunk/oak-store-federated/src/test/java/org/apache/jackrabbit/oak/federated/MountInfoProviderServiceTest.java
- copied, changed from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java
Removed:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/MultiplexingFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingMemoryFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreBuilderTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreTest.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingSegmentFixture.java
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java
jackrabbit/oak/trunk/oak-multiplex/pom.xml
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/CopyOnReadIdentityMap.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiff.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderService.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MountedNodeStore.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingContext.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeBuilder.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeState.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProvider.java
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/package-info.java
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiffTest.java
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MountInfoProviderServiceTest.java
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingChildrenCountTest.java
jackrabbit/oak/trunk/oak-multiplex/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingCompareTest.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-osgi/test-bundles.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=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-benchmarks/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-benchmarks/pom.xml Tue May 2 12:38:48 2017
@@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-multiplex</artifactId>
+ <artifactId>oak-store-federated</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=1793482&r1=1793481&r2=1793482&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
Tue May 2 12:38:48 2017
@@ -162,7 +162,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 multiplexing node store.")
+ OptionSpec<Integer> mounts = parser.accepts("mounts", "Number of
mounts for the federated 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);
@@ -209,9 +209,9 @@ public class BenchmarkRunner {
rdbjdbcpasswd.value(options),
rdbjdbctableprefix.value(options),
dropDBAfterTest.value(options), cacheSize * MB,
base.value(options),
fdsCache.value(options)),
- OakRepositoryFixture.getMultiplexing(base.value(options), 256,
cacheSize,
+ OakRepositoryFixture.getFederatedStore(base.value(options),
256, cacheSize,
mmap.value(options), mounts.value(options),
pathsPerMount.value(options)),
-
OakRepositoryFixture.getMultiplexingInMemory(mounts.value(options),
pathsPerMount.value(options))
+
OakRepositoryFixture.getFederatedMemoryStore(mounts.value(options),
pathsPerMount.value(options))
};
Benchmark[] allBenchmarks = new Benchmark[] {
Copied:
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java
(from r1793439,
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/MultiplexingFixture.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java?p2=jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java&p1=jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/MultiplexingFixture.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/MultiplexingFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/fixture/FederatedFixture.java
Tue May 2 12:38:48 2017
@@ -18,8 +18,8 @@
package org.apache.jackrabbit.oak.fixture;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.federated.FederatedNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
-import org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingNodeStore;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
@@ -33,7 +33,7 @@ import java.io.IOException;
import static
org.apache.jackrabbit.oak.segment.file.FileStoreBuilder.fileStoreBuilder;
-class MultiplexingFixture extends OakFixture {
+class FederatedFixture extends OakFixture {
private final File base;
@@ -51,7 +51,7 @@ class MultiplexingFixture extends OakFix
private FileStore fileStore;
- public MultiplexingFixture(String name, int mounts, int pathsPerMount) {
+ public FederatedFixture(String name, int mounts, int pathsPerMount) {
super(name);
this.inMemory = true;
this.mounts = mounts;
@@ -63,8 +63,8 @@ class MultiplexingFixture extends OakFix
this.memoryMapping = false;
}
- public MultiplexingFixture(String name, File base, int maxFileSizeMB, int
cacheSizeMB,
- boolean memoryMapping, int mounts, int
pathsPerMount) {
+ public FederatedFixture(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 MultiplexingFixture extends OakFix
}
mip.readOnlyMount("custom-mount-" + i, paths);
}
- MultiplexingNodeStore.Builder builder = new
MultiplexingNodeStore.Builder(mip.build(), nodeStore);
+ FederatedNodeStore.Builder builder = new
FederatedNodeStore.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=1793482&r1=1793481&r2=1793482&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
Tue May 2 12:38:48 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_MULTIPLEXING = "Oak-Multiplexing";
- public static final String OAK_MULTIPLEXING_MEMORY =
"Oak-Multiplexing-Memory";
+ public static final String OAK_FEDERATED_STORE = "Oak-Federated";
+ public static final String OAK_FEDERATED_MEMORY_STORE =
"Oak-Federated-Memory";
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 getMultiplexing(final String name, final File
base,
- final int maxFileSizeMB, final
int cacheSizeMB, final boolean memoryMapping,
- final int mounts, final int
pathsPerMount) {
- return new MultiplexingFixture(name, base, maxFileSizeMB, cacheSizeMB,
memoryMapping, mounts, pathsPerMount);
+ public static OakFixture getFederatedStore(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);
}
- public static OakFixture getMultiplexingInMemory(final String name, final
int mounts, final int pathsPerMount) {
- return new MultiplexingFixture(name, mounts, pathsPerMount);
+ public static OakFixture getFederatedMemoryStore(final String name, final
int mounts, final int pathsPerMount) {
+ return new FederatedFixture(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=1793482&r1=1793481&r2=1793482&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
Tue May 2 12:38:48 2017
@@ -108,14 +108,14 @@ public class OakRepositoryFixture implem
memoryMapping, true, dsCacheInMB));
}
- public static RepositoryFixture getMultiplexing(File base, int
maxFileSizeMB, int cacheSizeMB,
- final boolean
memoryMapping, int mounts, int pathsPerMount) {
- return new
OakRepositoryFixture(OakFixture.getMultiplexing(OakFixture.OAK_MULTIPLEXING,
+ public static RepositoryFixture getFederatedStore(File base, int
maxFileSizeMB, int cacheSizeMB,
+ final boolean
memoryMapping, int mounts, int pathsPerMount) {
+ return new
OakRepositoryFixture(OakFixture.getFederatedStore(OakFixture.OAK_FEDERATED_STORE,
base, maxFileSizeMB, cacheSizeMB, memoryMapping, mounts,
pathsPerMount));
}
- public static RepositoryFixture getMultiplexingInMemory(int mounts, int
pathsPerMount) {
- return new
OakRepositoryFixture(OakFixture.getMultiplexingInMemory(OakFixture.OAK_MULTIPLEXING_MEMORY,
mounts, pathsPerMount));
+ public static RepositoryFixture getFederatedMemoryStore(int mounts, int
pathsPerMount) {
+ return new
OakRepositoryFixture(OakFixture.getFederatedMemoryStore(OakFixture.OAK_FEDERATED_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=1793482&r1=1793481&r2=1793482&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
Tue May 2 12:38:48 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, MULTIPLEXED_SEGMENT, MULTIPLEXED_MEM
+ DOCUMENT_NS, @Deprecated SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS,
DOCUMENT_MEM, SEGMENT_TAR, FEDERATED_SEGMENT, FEDERATED_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=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Tue May 2 12:38:48
2017
@@ -168,7 +168,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-multiplex</artifactId>
+ <artifactId>oak-store-federated</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=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/pom.xml Tue May 2 12:38:48 2017
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-multiplex</artifactId>
+ <artifactId>oak-store-federated</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=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/pom.xml Tue May 2 12:38:48 2017
@@ -113,7 +113,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-multiplex</artifactId>
+ <artifactId>oak-store-federated</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml?rev=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it-osgi/test-bundles.xml Tue May 2 12:38:48 2017
@@ -38,7 +38,7 @@
<include>org.apache.jackrabbit:oak-api</include>
<include>org.apache.jackrabbit:oak-commons</include>
<include>org.apache.jackrabbit:oak-core</include>
- <include>org.apache.jackrabbit:oak-multiplex</include>
+ <include>org.apache.jackrabbit:oak-store-federated</include>
<include>org.apache.jackrabbit:oak-segment-tar</include>
<include>org.apache.jackrabbit:oak-jcr</include>
<include>org.apache.jackrabbit:oak-lucene</include>
Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Tue May 2 12:38:48 2017
@@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-multiplex</artifactId>
+ <artifactId>oak-store-federated</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=1793482&r1=1793481&r2=1793482&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
Tue May 2 12:38:48 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.plugins.multiplex.MultiplexingMemoryFixture;
-import org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingSegmentFixture;
+import org.apache.jackrabbit.oak.federated.FederatedMemoryFixture;
+import org.apache.jackrabbit.oak.federated.FederatedSegmentFixture;
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 MULTIPLEXED_SEGMENT = new
MultiplexingSegmentFixture();
+ public static final NodeStoreFixture FEDERATED_SEGMENT = new
FederatedSegmentFixture();
- public static final NodeStoreFixture MULTIPLEXED_MEM = new
MultiplexingMemoryFixture();
+ public static final NodeStoreFixture FEDERATED_MEM = new
FederatedMemoryFixture();
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.MULTIPLEXED_SEGMENT)) {
- configuredFixtures.add(MULTIPLEXED_SEGMENT);
+ if (fixtures.contains(FixturesHelper.Fixture.FEDERATED_SEGMENT)) {
+ configuredFixtures.add(FEDERATED_SEGMENT);
}
- if (fixtures.contains(FixturesHelper.Fixture.MULTIPLEXED_MEM)) {
- configuredFixtures.add(MULTIPLEXED_MEM);
+ if (fixtures.contains(FixturesHelper.Fixture.FEDERATED_MEM)) {
+ configuredFixtures.add(FEDERATED_MEM);
}
Collection<Object[]> result = new ArrayList<Object[]>();
Copied:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java
(from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingMemoryFixture.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingMemoryFixture.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingMemoryFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedMemoryFixture.java
Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
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 MultiplexingMemoryFixture extends NodeStoreFixture {
+public class FederatedMemoryFixture extends NodeStoreFixture {
private static final String MOUNT_PATH = "/tmp";
@@ -37,7 +37,7 @@ public class MultiplexingMemoryFixture e
NodeStore globalStore = new MemoryNodeStore();
NodeStore tempMount = new MemoryNodeStore();
- return new MultiplexingNodeStore.Builder(mip,
globalStore).addMount("temp", tempMount).build();
+ return new FederatedNodeStore.Builder(mip,
globalStore).addMount("temp", tempMount).build();
}
@Override
Copied:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java
(from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreBuilderTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreBuilderTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreBuilderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreBuilderTest.java
Tue May 2 12:38:48 2017
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
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 MultiplexingNodeStoreBuilderTest {
+public class FederatedNodeStoreBuilderTest {
@Test(expected = IllegalArgumentException.class)
public void builderRejectsTooManyReadWriteStores_oneExtra() {
@@ -31,7 +31,7 @@ public class MultiplexingNodeStoreBuilde
.mount("temp", "/tmp")
.build();
- new MultiplexingNodeStore.Builder(mip, new MemoryNodeStore())
+ new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("temp", new MemoryNodeStore())
.build();
}
@@ -43,7 +43,7 @@ public class MultiplexingNodeStoreBuilde
.readOnlyMount("readOnly", "/readOnly")
.build();
- new MultiplexingNodeStore.Builder(mip, new MemoryNodeStore())
+ new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("temp", new MemoryNodeStore())
.addMount("readOnly", new MemoryNodeStore())
.build();
@@ -56,7 +56,7 @@ public class MultiplexingNodeStoreBuilde
.readOnlyMount("readOnly2", "/readOnly2")
.build();
- new MultiplexingNodeStore.Builder(mip, new MemoryNodeStore())
+ new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("readOnly", new MemoryNodeStore())
.addMount("readOnly2", new MemoryNodeStore())
.build();
@@ -68,7 +68,7 @@ public class MultiplexingNodeStoreBuilde
.mount("temp", "/tmp")
.build();
- new MultiplexingNodeStore.Builder(mip, new MemoryNodeStore())
+ new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
.build();
}
@@ -78,7 +78,7 @@ public class MultiplexingNodeStoreBuilde
.mount("temp", "/tmp")
.build();
- new MultiplexingNodeStore.Builder(mip, new MemoryNodeStore())
+ new FederatedNodeStore.Builder(mip, new MemoryNodeStore())
.addMount("not-temp", new MemoryNodeStore())
.build();
}
Copied:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java
(from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreTest.java
Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import static com.google.common.base.Predicates.compose;
import static com.google.common.collect.Iterables.filter;
@@ -83,14 +83,14 @@ import com.google.common.collect.Iterabl
import com.google.common.collect.Lists;
@RunWith(Parameterized.class)
-public class MultiplexingNodeStoreTest {
+public class FederatedNodeStoreTest {
private final NodeStoreKind root;
private final NodeStoreKind mounts;
private final List<NodeStoreRegistration> registrations = newArrayList();
- private MultiplexingNodeStore store;
+ private FederatedNodeStore store;
private NodeStore globalStore;
private NodeStore mountedStore;
private NodeStore deepMountedStore;
@@ -106,7 +106,7 @@ public class MultiplexingNodeStoreTest {
});
}
- public MultiplexingNodeStoreTest(NodeStoreKind root, NodeStoreKind mounts)
{
+ public FederatedNodeStoreTest(NodeStoreKind root, NodeStoreKind mounts) {
this.root = root;
this.mounts = mounts;
}
@@ -180,7 +180,7 @@ public class MultiplexingNodeStoreTest {
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 MultiplexingNodeStore(mip, globalStore, nonDefaultStores);
+ store = new FederatedNodeStore(mip, globalStore, nonDefaultStores);
}
@After
@@ -228,7 +228,7 @@ public class MultiplexingNodeStoreTest {
}
@Test
- public void childNodeEntryForMountIsMultiplexed() {
+ public void childNodeEntryForMountIsFederated() {
ChildNodeEntry libsNode =
Iterables.find(store.getRoot().getChildNodeEntries(), new
Predicate<ChildNodeEntry>() {
@Override
@@ -335,7 +335,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertThat("Property must be visible in multiplexed store",
+ assertThat("Property must be visible in federated store",
store.getRoot().getProperty("newProp").getValue(Type.STRING),
equalTo("newValue"));
assertThat("Property must be visible in owning (root) store",
@@ -350,7 +350,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Property must be removed from multiplexed store",
store.getRoot().hasProperty("prop"));
+ assertFalse("Property must be removed from federated store",
store.getRoot().hasProperty("prop"));
assertFalse("Property must be removed from owning (root) store",
globalStore.getRoot().hasProperty("prop"));
}
@@ -362,7 +362,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertTrue("Node must be added to multiplexed store",
store.getRoot().hasChildNode("newNode"));
+ assertTrue("Node must be added to federated store",
store.getRoot().hasChildNode("newNode"));
assertTrue("Node must be added to owning (root) store",
globalStore.getRoot().hasChildNode("newNode"));
}
@@ -375,7 +375,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertTrue("Node must be added to multiplexed store",
store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ assertTrue("Node must be added to federated store",
store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
assertTrue("Node must be added to owning (mounted) store",
mountedStore.getRoot().getChildNode("tmp").hasChildNode("newNode"));
}
@@ -387,7 +387,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node must be removed from the multiplexed store",
store.getRoot().hasChildNode("apps"));
+ assertFalse("Node must be removed from the federated store",
store.getRoot().hasChildNode("apps"));
assertFalse("Node must be removed from the owning (root) store",
globalStore.getRoot().hasChildNode("apps"));
}
@@ -400,7 +400,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertTrue("Node must be added to multiplexed store",
store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ assertTrue("Node must be added to federated store",
store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
builder = store.getRoot().builder();
@@ -408,8 +408,8 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node must be removed from the multiplexed store",
store.getRoot().getChildNode("tmp").hasChildNode("newNode"));
- assertFalse("Node must be removed from the owning (multiplexed)
store", globalStore.getRoot().getChildNode("tmp").hasChildNode("newNode"));
+ 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"));
}
@Test
@@ -498,10 +498,10 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node apps must have no properties (multiplexed store)",
store.getRoot().getChildNode("apps").hasProperty("prop"));
+ assertFalse("Node apps must have no properties (federated 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 (multiplexed store)",
store.getRoot().getChildNode("apps").hasChildNode("child1"));
+ assertTrue("Node /apps/child1 must exist (federated store)",
store.getRoot().getChildNode("apps").hasChildNode("child1"));
assertTrue("Node /apps/child1 must exist (root store)",
globalStore.getRoot().getChildNode("apps").hasChildNode("child1"));
}
@@ -515,10 +515,10 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- assertFalse("Node tmp must have no properties (multiplexed store)",
store.getRoot().getChildNode("tmp").hasProperty("prop1"));
+ assertFalse("Node tmp must have no properties (federated 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 (multiplexed store)",
store.getRoot().getChildNode("tmp").hasChildNode("child3"));
+ assertTrue("Node /tmp/build3 must exist (federated store)",
store.getRoot().getChildNode("tmp").hasChildNode("child3"));
assertTrue("Node /tmp/child3 must exist (mounted store)",
mountedStore.getRoot().getChildNode("tmp").hasChildNode("child3"));
}
@@ -597,7 +597,7 @@ public class MultiplexingNodeStoreTest {
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
multiplexed store",
+ assertTrue("/multi-holder/oak:mount-temp should be visible from the
federated store",
holderNode.hasChildNode("oak:mount-temp"));
assertChildNodeNames(holderNode, "oak:mount-temp");
@@ -618,7 +618,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertFalse("/src must no longer exist",
store.getRoot().hasChildNode("src"));
- assertTrue("/dst/src must exist (multiplexed store)",
store.getRoot().getChildNode("dst").hasChildNode("src"));
+ assertTrue("/dst/src must exist (federated store)",
store.getRoot().getChildNode("dst").hasChildNode("src"));
}
@Test
@@ -634,7 +634,7 @@ public class MultiplexingNodeStoreTest {
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
assertFalse("/src must no longer exist",
store.getRoot().hasChildNode("src"));
- assertTrue("/tmp/src must exist (multiplexed store)",
store.getRoot().getChildNode("tmp").hasChildNode("src"));
+ assertTrue("/tmp/src must exist (federated store)",
store.getRoot().getChildNode("tmp").hasChildNode("src"));
}
Copied:
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java
(from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingSegmentFixture.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingSegmentFixture.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingSegmentFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/FederatedSegmentFixture.java
Tue May 2 12:38:48 2017
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
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 MultiplexingSegmentFixture extends NodeStoreFixture {
+public class FederatedSegmentFixture extends NodeStoreFixture {
private static final String MOUNT_PATH = "/tmp";
@@ -41,7 +41,7 @@ public class MultiplexingSegmentFixture
NodeStore globalStore = SegmentNodeStoreBuilders.builder(new
MemoryStore()).build();
NodeStore tempMount = SegmentNodeStoreBuilders.builder(new
MemoryStore()).build();
- return new MultiplexingNodeStore.Builder(mip,
globalStore).addMount("temp", tempMount).build();
+ return new FederatedNodeStore.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/federated/PrivateStoreValidatorProviderTest.java
(from r1793439,
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java?p2=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java&p1=jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/multiplex/PrivateStoreValidatorProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/federated/PrivateStoreValidatorProviderTest.java
Tue May 2 12:38:48 2017
@@ -17,8 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
-
+package org.apache.jackrabbit.oak.federated;
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=1793482&r1=1793481&r2=1793482&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
Tue May 2 12:38:48 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.MULTIPLEXED_SEGMENT || fixture
== NodeStoreFixtures.MULTIPLEXED_MEM) {
+ || fixture == NodeStoreFixtures.FEDERATED_MEM || fixture ==
NodeStoreFixtures.FEDERATED_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=1793482&r1=1793481&r2=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Tue May 2 12:38:48 2017
@@ -253,7 +253,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-multiplex</artifactId>
+ <artifactId>oak-store-federated</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Copied: jackrabbit/oak/trunk/oak-store-federated/pom.xml (from r1793439,
jackrabbit/oak/trunk/oak-multiplex/pom.xml)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/pom.xml?p2=jackrabbit/oak/trunk/oak-store-federated/pom.xml&p1=jackrabbit/oak/trunk/oak-multiplex/pom.xml&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-multiplex/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-federated/pom.xml Tue May 2 12:38:48 2017
@@ -27,8 +27,8 @@
<relativePath>../oak-parent/pom.xml</relativePath>
</parent>
- <artifactId>oak-multiplex</artifactId>
- <name>Oak Multiplexing</name>
+ <artifactId>oak-store-federated</artifactId>
+ <name>Oak Federated Store</name>
<packaging>bundle</packaging>
<build>
Copied:
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/CopyOnReadIdentityMap.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/CopyOnReadIdentityMap.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/CopyOnReadIdentityMap.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/CopyOnReadIdentityMap.java
Tue May 2 12:38:48 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.base.Function;
Copied:
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeBuilder.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeBuilder.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeBuilder.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeBuilder.java
Tue May 2 12:38:48 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.base.Function;
import com.google.common.base.Objects;
@@ -44,29 +44,27 @@ import static com.google.common.collect.
import static java.lang.Long.MAX_VALUE;
import static java.util.Collections.singleton;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
-import static
org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingNodeState.STOP_COUNTING_CHILDREN;
-import static
org.apache.jackrabbit.oak.plugins.multiplex.MultiplexingNodeState.accumulateChildSizes;
import static
org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
-class MultiplexingNodeBuilder implements NodeBuilder {
+class FederatedNodeBuilder implements NodeBuilder {
private final String path;
- private final MultiplexingContext ctx;
+ private final FederationContext ctx;
private Map<MountedNodeStore, NodeBuilder> nodeBuilders;
private final MountedNodeStore owningStore;
- private final MultiplexingNodeBuilder parent;
+ private final FederatedNodeBuilder parent;
- private final MultiplexingNodeBuilder rootBuilder;
+ private final FederatedNodeBuilder rootBuilder;
- MultiplexingNodeBuilder(String path, Map<MountedNodeStore, NodeBuilder>
nodeBuilders, MultiplexingContext ctx) {
+ FederatedNodeBuilder(String path, Map<MountedNodeStore, NodeBuilder>
nodeBuilders, FederationContext ctx) {
this(path, nodeBuilders, ctx, null);
}
- private MultiplexingNodeBuilder(String path, Map<MountedNodeStore,
NodeBuilder> nodeBuilders, MultiplexingContext ctx, MultiplexingNodeBuilder
parent) {
+ private FederatedNodeBuilder(String path, Map<MountedNodeStore,
NodeBuilder> nodeBuilders, FederationContext ctx, FederatedNodeBuilder 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;
@@ -86,12 +84,12 @@ class MultiplexingNodeBuilder implements
@Override
public NodeState getNodeState() {
- return new MultiplexingNodeState(path, new
IdentityHashMap<>(buildersToNodeStates(nodeBuilders)), ctx);
+ return new FederatedNodeState(path, new
IdentityHashMap<>(buildersToNodeStates(nodeBuilders)), ctx);
}
@Override
public NodeState getBaseState() {
- return new MultiplexingNodeState(path,
buildersToBaseStates(nodeBuilders), ctx);
+ return new FederatedNodeState(path,
buildersToBaseStates(nodeBuilders), ctx);
}
private static Map<MountedNodeStore, NodeState>
buildersToNodeStates(Map<MountedNodeStore, NodeBuilder> builders) {
@@ -211,7 +209,7 @@ class MultiplexingNodeBuilder implements
return this;
}
- // child-related methods, require multiplexing
+ // child-related methods, require federation
@Override
public long getChildNodeCount(final long max) {
List<MountedNodeStore> contributingStores =
ctx.getContributingStoresForBuilders(path, nodeBuilders);
@@ -221,12 +219,12 @@ class MultiplexingNodeBuilder implements
return getWrappedNodeBuilder().getChildNodeCount(max);
} else {
// Count the children in each contributing store.
- return accumulateChildSizes(concat(transform(contributingStores,
new Function<MountedNodeStore, Iterable<String>>() {
+ return
FederatedNodeState.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(STOP_COUNTING_CHILDREN);
+ return
singleton(FederatedNodeState.STOP_COUNTING_CHILDREN);
} else {
return filter(contributing.getChildNodeNames(),
ctx.belongsToStore(input, path));
}
@@ -275,16 +273,16 @@ class MultiplexingNodeBuilder implements
@Override
public NodeBuilder getChildNode(final String name) {
String childPath = simpleConcat(path, name);
- if (!ctx.shouldBeMultiplexed(childPath)) {
+ if (!ctx.shouldBeFederated(childPath)) {
return
nodeBuilders.get(ctx.getOwningStore(childPath)).getChildNode(name);
}
- Map<MountedNodeStore, NodeBuilder> newNodeBuilders =
Maps.transformValues(nodeBuilders, new Function<NodeBuilder, NodeBuilder>() {
+ Map<MountedNodeStore, NodeBuilder> newNodeBuilders =
transformValues(nodeBuilders, new Function<NodeBuilder, NodeBuilder>() {
@Override
public NodeBuilder apply(NodeBuilder input) {
return input.getChildNode(name);
}
});
- return new MultiplexingNodeBuilder(childPath, newNodeBuilders, ctx,
this);
+ return new FederatedNodeBuilder(childPath, newNodeBuilders, ctx, this);
}
@Override
@@ -301,7 +299,7 @@ class MultiplexingNodeBuilder implements
createAncestors(childStore);
}
final NodeBuilder childBuilder =
nodeBuilders.get(childStore).setChildNode(name, nodeState);
- if (!ctx.shouldBeMultiplexed(childPath)) {
+ if (!ctx.shouldBeFederated(childPath)) {
return childBuilder;
}
@@ -315,7 +313,7 @@ class MultiplexingNodeBuilder implements
}
}
});
- return new MultiplexingNodeBuilder(childPath, newNodeBuilders, ctx,
this);
+ return new FederatedNodeBuilder(childPath, newNodeBuilders, ctx, this);
}
@Override
@@ -361,7 +359,7 @@ class MultiplexingNodeBuilder implements
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
- MultiplexingNodeBuilder builder = this;
+ FederatedNodeBuilder builder = this;
String sourcePath = getSourcePathAnnotation(builder);
while (sourcePath == null && builder.parent != null) {
builder = builder.parent;
@@ -381,7 +379,7 @@ class MultiplexingNodeBuilder implements
}
}
- private static String getSourcePathAnnotation(MultiplexingNodeBuilder
builder) {
+ private static String getSourcePathAnnotation(FederatedNodeBuilder
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-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeState.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeState.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeState.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeState.java
Tue May 2 12:38:48 2017
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.base.Function;
-import com.google.common.collect.Maps;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry;
@@ -40,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.plugins.multiplex.MultiplexingNodeBuilder.simpleConcat;
+import static
org.apache.jackrabbit.oak.federated.FederatedNodeBuilder.simpleConcat;
import static org.apache.jackrabbit.oak.spi.state.ChildNodeEntry.GET_NAME;
-class MultiplexingNodeState extends AbstractNodeState {
+class FederatedNodeState 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 multiplexing node
store.
+ // /a and /a/b, which will not be visible through the federated node store.
//
// If a node store holds information _below_ a path which belongs to
another
- // repository, the multiplexing node store will not consider that
information.
+ // repository, the federated 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(MultiplexingNodeState.class.getName() + ".stopCountingChildren");
+ static final String STOP_COUNTING_CHILDREN = new
String(FederatedNodeState.class.getName() + ".stopCountingChildren");
private final String path;
- private final MultiplexingContext ctx;
+ private final FederationContext ctx;
private final MountedNodeStore owningStore;
private final Map<MountedNodeStore, NodeState> nodeStates;
- MultiplexingNodeState(String path, Map<MountedNodeStore, NodeState>
nodeStates, MultiplexingContext ctx) {
+ FederatedNodeState(String path, Map<MountedNodeStore, NodeState>
nodeStates, FederationContext 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;
@@ -113,16 +112,16 @@ class MultiplexingNodeState extends Abst
@Override
public NodeState getChildNode(final String name) {
String childPath = simpleConcat(path, name);
- if (!ctx.shouldBeMultiplexed(childPath)) {
+ if (!ctx.shouldBeFederated(childPath)) {
return
nodeStates.get(ctx.getOwningStore(childPath)).getChildNode(name);
}
- Map<MountedNodeStore, NodeState> newNodeStates =
Maps.transformValues(nodeStates, new Function<NodeState, NodeState>() {
+ Map<MountedNodeStore, NodeState> newNodeStates =
transformValues(nodeStates, new Function<NodeState, NodeState>() {
@Override
public NodeState apply(NodeState input) {
return input.getChildNode(name);
}
});
- return new MultiplexingNodeState(childPath, newNodeStates, ctx);
+ return new FederatedNodeState(childPath, newNodeStates, ctx);
}
@Override
@@ -178,8 +177,8 @@ class MultiplexingNodeState extends Abst
@Override
public boolean compareAgainstBaseState(NodeState base, NodeStateDiff diff)
{
- if (base instanceof MultiplexingNodeState) {
- MultiplexingNodeState multiBase = (MultiplexingNodeState) base;
+ if (base instanceof FederatedNodeState) {
+ FederatedNodeState multiBase = (FederatedNodeState) 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)) {
@@ -206,7 +205,7 @@ class MultiplexingNodeState extends Abst
return input.builder();
}
});
- return new MultiplexingNodeBuilder(path, nodeBuilders, ctx);
+ return new FederatedNodeBuilder(path, nodeBuilders, ctx);
}
private NodeState getWrappedNodeState() {
@@ -290,9 +289,9 @@ class MultiplexingNodeState extends Abst
private final NodeStateDiff diff;
- private final MultiplexingNodeState base;
+ private final FederatedNodeState base;
- public WrappingDiff(NodeStateDiff diff, MultiplexingNodeState base) {
+ public WrappingDiff(NodeStateDiff diff, FederatedNodeState base) {
this.diff = diff;
this.base = base;
}
@@ -332,7 +331,7 @@ class MultiplexingNodeState extends Abst
}
private NodeState wrapAfter(String name) {
- return MultiplexingNodeState.this.getChildNode(name);
+ return FederatedNodeState.this.getChildNode(name);
}
}
Copied:
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStore.java
Tue May 2 12:38:48 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -60,19 +60,19 @@ 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.plugins.multiplex.ModifiedPathDiff.getModifiedPaths;
+import static
org.apache.jackrabbit.oak.federated.ModifiedPathDiff.getModifiedPaths;
/**
- * A {@link NodeStore} implementation that multiplexes other {@link NodeStore}
instances
+ * A {@link NodeStore} implementation that combines other {@link NodeStore}
instances
* mounted under paths defined by {@link Mount}.
*
- * <p>The main objective of this implementation is to multiplex operations
working on
+ * <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
- * multiplexing would technically work at the NodeStore level there are several
+ * federation 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 multiplexed
node stores.</li>
+ * of the thread safety measures already put in place by the federated 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
- * MultiplexingNodeStore is to create a normal repository, split it into parts
+ * FederatedNodeStore 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 multiplex split parts together.
+ * node store implementation to federate split parts together.
*/
-public class MultiplexingNodeStore implements NodeStore, Observable {
+public class FederatedNodeStore implements NodeStore, Observable {
- private static final Logger LOG =
LoggerFactory.getLogger(MultiplexingNodeStore.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FederatedNodeStore.class);
- private static final String CHECKPOINT_ID_PREFIX =
"multiplexing.checkpoint.";
+ private static final String CHECKPOINT_ID_PREFIX = "federated.checkpoint.";
private final TreeSet<String> ignoreReadOnlyWritePaths;
- final MultiplexingContext ctx;
+ final FederationContext ctx;
private final List<Observer> observers = new CopyOnWriteArrayList<>();
// visible for testing only
- MultiplexingNodeStore(MountInfoProvider mip, NodeStore globalStore,
List<MountedNodeStore> nonDefaultStore) {
+ FederatedNodeStore(MountInfoProvider mip, NodeStore globalStore,
List<MountedNodeStore> nonDefaultStore) {
this(mip, globalStore, nonDefaultStore,
Collections.<String>emptyList());
}
- MultiplexingNodeStore(MountInfoProvider mip, NodeStore globalStore,
List<MountedNodeStore> nonDefaultStore, List<String> ignoreReadOnlyWritePaths) {
- this.ctx = new MultiplexingContext(mip, globalStore, nonDefaultStore);
+ FederatedNodeStore(MountInfoProvider mip, NodeStore globalStore,
List<MountedNodeStore> nonDefaultStore, List<String> ignoreReadOnlyWritePaths) {
+ this.ctx = new FederationContext(mip, globalStore, nonDefaultStore);
this.ignoreReadOnlyWritePaths = new
TreeSet<>(ignoreReadOnlyWritePaths);
}
@Override
public NodeState getRoot() {
- // the multiplexed root state exposes the node states as they are
+ // the federated 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 MultiplexingNodeStore imple
@Override
public NodeState merge(NodeBuilder builder, CommitHook commitHook,
CommitInfo info) throws CommitFailedException {
- checkArgument(builder instanceof MultiplexingNodeBuilder);
- MultiplexingNodeBuilder nodeBuilder = (MultiplexingNodeBuilder)
builder;
+ checkArgument(builder instanceof FederatedNodeBuilder);
+ FederatedNodeBuilder nodeBuilder = (FederatedNodeBuilder) builder;
if (!PathUtils.denotesRoot(nodeBuilder.getPath())) {
throw new IllegalArgumentException();
}
@@ -139,14 +139,14 @@ public class MultiplexingNodeStore imple
NodeState result = nodeStore.merge(partialBuilder,
EmptyHook.INSTANCE, info);
resultStates.put(mountedNodeStore, result);
}
- MultiplexingNodeState newRoot = createRootNodeState(resultStates);
+ FederatedNodeState newRoot = createRootNodeState(resultStates);
for (Observer observer : observers) {
observer.contentChanged(newRoot, info);
}
return newRoot;
}
- private void assertNoChangesOnReadOnlyMounts(MultiplexingNodeBuilder
nodeBuilder) throws CommitFailedException {
+ private void assertNoChangesOnReadOnlyMounts(FederatedNodeBuilder
nodeBuilder) throws CommitFailedException {
for (MountedNodeStore mountedNodeStore :
ctx.getAllMountedNodeStores()) {
if (!mountedNodeStore.getMount().isReadOnly()) {
continue;
@@ -162,7 +162,7 @@ public class MultiplexingNodeStore imple
}
Set<String> failingChangedPaths = difference(changedPaths,
ignoredChangedPaths);
if (!failingChangedPaths.isEmpty()) {
- throw new CommitFailedException("Multiplex", 31, "Unable
to perform changes on read-only mount " + mountedNodeStore.getMount().getName()
+ ". Failing paths: " + failingChangedPaths.toString());
+ throw new CommitFailedException("FederatedStore", 31,
"Unable to perform changes on read-only mount " +
mountedNodeStore.getMount().getName() + ". Failing paths: " +
failingChangedPaths.toString());
}
}
}
@@ -170,9 +170,9 @@ public class MultiplexingNodeStore imple
@Override
public NodeState rebase(NodeBuilder builder) {
- checkArgument(builder instanceof MultiplexingNodeBuilder);
+ checkArgument(builder instanceof FederatedNodeBuilder);
- MultiplexingNodeBuilder nodeBuilder = (MultiplexingNodeBuilder)
builder;
+ FederatedNodeBuilder nodeBuilder = (FederatedNodeBuilder) builder;
Map<MountedNodeStore, NodeState> resultStates = newHashMap();
for (MountedNodeStore mountedNodeStore :
ctx.getAllMountedNodeStores()) {
NodeStore nodeStore = mountedNodeStore.getNodeStore();
@@ -185,9 +185,9 @@ public class MultiplexingNodeStore imple
@Override
public NodeState reset(NodeBuilder builder) {
- checkArgument(builder instanceof MultiplexingNodeBuilder);
+ checkArgument(builder instanceof FederatedNodeBuilder);
- MultiplexingNodeBuilder nodeBuilder = (MultiplexingNodeBuilder)
builder;
+ FederatedNodeBuilder nodeBuilder = (FederatedNodeBuilder) builder;
Map<MountedNodeStore, NodeState> resultStates = newHashMap();
for (MountedNodeStore mountedNodeStore :
ctx.getAllMountedNodeStores()) {
NodeStore nodeStore = mountedNodeStore.getNodeStore();
@@ -198,8 +198,8 @@ public class MultiplexingNodeStore imple
return createRootNodeState(resultStates);
}
- private MultiplexingNodeState createRootNodeState(Map<MountedNodeStore,
NodeState> rootStates) {
- return new MultiplexingNodeState("/", rootStates, ctx);
+ private FederatedNodeState createRootNodeState(Map<MountedNodeStore,
NodeState> rootStates) {
+ return new FederatedNodeState("/", rootStates, ctx);
}
@Override
@@ -224,12 +224,12 @@ public class MultiplexingNodeStore imple
return filter(globalNodeStore.checkpoints(), new Predicate<String>() {
@Override
public boolean apply(String checkpoint) {
- return isMultiplexingCheckpoint(checkpoint);
+ return isFederatedCheckpoint(checkpoint);
}
});
}
- private boolean isMultiplexingCheckpoint(String checkpoint) {
+ private boolean isFederatedCheckpoint(String checkpoint) {
Map<String, String> props =
ctx.getGlobalStore().getNodeStore().checkpointInfo(checkpoint);
if (props == null) {
return false;
@@ -297,7 +297,7 @@ public class MultiplexingNodeStore imple
if (any(nodeStates.values(), isNull())) {
return null;
}
- return new MultiplexingNodeState("/", nodeStates, ctx);
+ return new FederatedNodeState("/", nodeStates, ctx);
}
@Override
@@ -403,10 +403,10 @@ public class MultiplexingNodeStore imple
return this;
}
- public MultiplexingNodeStore build() {
+ public FederatedNodeStore build() {
checkReadWriteMountsNumber();
checkMountsAreConsistentWithMounts();
- return new MultiplexingNodeStore(mip, globalStore,
nonDefaultStores, ignoreReadOnlyWritePaths);
+ return new FederatedNodeStore(mip, globalStore, nonDefaultStores,
ignoreReadOnlyWritePaths);
}
private void checkReadWriteMountsNumber() {
Copied:
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingNodeStoreService.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederatedNodeStoreService.java
Tue May 2 12:38:48 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
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 MultiplexingNodeStoreService {
+public class FederatedNodeStoreService {
- private static final Logger LOG =
LoggerFactory.getLogger(MultiplexingNodeStoreService.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(FederatedNodeStoreService.class);
- private static final String GLOBAL_ROLE = "multiplexing:global";
+ private static final String GLOBAL_ROLE = "federated:global";
- private static final String MOUNT_ROLE_PREFIX = "multiplexing:mount:";
+ private static final String MOUNT_ROLE_PREFIX = "federated:mount:";
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY, policy =
ReferencePolicy.STATIC)
private MountInfoProvider mountInfoProvider;
@@ -79,15 +79,15 @@ public class MultiplexingNodeStoreServic
protected void activate(ComponentContext context, Map<String, ?> config) {
this.context = context;
ignoreReadOnlyWritePaths =
PropertiesUtil.toStringArray(config.get(PROP_IGNORE_READ_ONLY_WRITES));
- registerMultiplexingNodeStore();
+ registerFederatedNodeStore();
}
@Deactivate
protected void deactivate() {
- unregisterMultiplexingNodeStore();
+ unregisterFederatedNodeStore();
}
- private void registerMultiplexingNodeStore() {
+ private void registerFederatedNodeStore() {
if (nsReg != null) {
return; // already registered
}
@@ -103,7 +103,7 @@ public class MultiplexingNodeStoreServic
}
if (globalNs == null) {
- LOG.info("Multiplexing node store registration is deferred until
there's a global node store registered in OSGi");
+ LOG.info("Federated 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 MultiplexingNodeStoreServic
for (Mount m : mountInfoProvider.getNonDefaultMounts()) {
if (!availableMounts.contains(m.getName())) {
- LOG.info("Multiplexing node store registration is deferred
until there's mount {} registered in OSGi", m.getName());
+ LOG.info("Federated 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");
- MultiplexingNodeStore.Builder builder = new
MultiplexingNodeStore.Builder(mountInfoProvider,
globalNs.getNodeStoreProvider().getNodeStore());
+ FederatedNodeStore.Builder builder = new
FederatedNodeStore.Builder(mountInfoProvider,
globalNs.getNodeStoreProvider().getNodeStore());
for (String p : ignoreReadOnlyWritePaths) {
builder.addIgnoredReadOnlyWritePath(p);
}
@@ -134,15 +134,15 @@ public class MultiplexingNodeStoreServic
}
Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(Constants.SERVICE_PID,
MultiplexingNodeStore.class.getName());
- props.put("oak.nodestore.description", new String[] {
"nodeStoreType=multiplexing" } );
+ props.put(Constants.SERVICE_PID, FederatedNodeStore.class.getName());
+ props.put("oak.nodestore.description", new String[] {
"nodeStoreType=federatedStore" } );
- MultiplexingNodeStore store = builder.build();
+ FederatedNodeStore store = builder.build();
observerTracker = new ObserverTracker(store);
observerTracker.start(context.getBundleContext());
- LOG.info("Registering the multiplexing node store");
+ LOG.info("Registering the federated node store");
nsReg = context.getBundleContext().registerService(
new String[]{
@@ -168,9 +168,9 @@ public class MultiplexingNodeStoreServic
return
PropertiesUtil.toString(ns.getProps().get("oak.nodestore.description"),
ns.getNodeStoreProvider().getClass().toString());
}
- private void unregisterMultiplexingNodeStore() {
+ private void unregisterFederatedNodeStore() {
if (nsReg != null) {
- LOG.info("Unregistering the multiplexing node store");
+ LOG.info("Unregistering the federated node store");
nsReg.unregister();
nsReg = null;
}
@@ -189,8 +189,8 @@ public class MultiplexingNodeStoreServic
return;
}
- unregisterMultiplexingNodeStore();
- registerMultiplexingNodeStore();
+ unregisterFederatedNodeStore();
+ registerFederatedNodeStore();
}
protected void unbindNodeStore(NodeStoreProvider ns) {
@@ -206,8 +206,8 @@ public class MultiplexingNodeStoreServic
return;
}
- unregisterMultiplexingNodeStore();
- registerMultiplexingNodeStore();
+ unregisterFederatedNodeStore();
+ registerFederatedNodeStore();
}
private static class NodeStoreWithProps {
Copied:
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingContext.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingContext.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/MultiplexingContext.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/FederationContext.java
Tue May 2 12:38:48 2017
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -27,7 +27,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import javax.annotation.Nullable;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
@@ -42,7 +41,7 @@ import static com.google.common.collect.
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
-class MultiplexingContext {
+class FederationContext {
private final MountInfoProvider mip;
@@ -52,7 +51,7 @@ class MultiplexingContext {
private final Map<Mount, MountedNodeStore> nodeStoresByMount;
- MultiplexingContext(MountInfoProvider mip, NodeStore globalStore,
List<MountedNodeStore> nonDefaultStores) {
+ FederationContext(MountInfoProvider mip, NodeStore globalStore,
List<MountedNodeStore> nonDefaultStores) {
this.mip = mip;
this.globalStore = new MountedNodeStore(mip.getDefaultMount(),
globalStore);
this.nonDefaultStores = nonDefaultStores;
@@ -99,7 +98,7 @@ class MultiplexingContext {
});
}
- boolean shouldBeMultiplexed(final String path) {
+ boolean shouldBeFederated(final String path) {
if (Iterables.tryFind(nonDefaultStores, new
Predicate<MountedNodeStore>() {
@Override
public boolean apply(MountedNodeStore input) {
Copied:
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java
(from r1793439,
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiff.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java?p2=jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java&p1=jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiff.java&r1=1793439&r2=1793482&rev=1793482&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-multiplex/src/main/java/org/apache/jackrabbit/oak/plugins/multiplex/ModifiedPathDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-store-federated/src/main/java/org/apache/jackrabbit/oak/federated/ModifiedPathDiff.java
Tue May 2 12:38:48 2017
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.multiplex;
+package org.apache.jackrabbit.oak.federated;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
