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 2018/10/02 11:51:14 UTC
svn commit: r1842613 - in
/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite:
CompositeNodeStore.java package-info.java
Author: tomekr
Date: Tue Oct 2 11:51:14 2018
New Revision: 1842613
URL: http://svn.apache.org/viewvc?rev=1842613&view=rev
Log:
OAK-7796: Remove the support for the writeable partial stores
- remove the changes breaking backward compatiblity
Modified:
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
Modified: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java?rev=1842613&r1=1842612&r2=1842613&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java Tue Oct 2 11:51:14 2018
@@ -47,8 +47,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
@@ -414,6 +412,27 @@ public class CompositeNodeStore implemen
return this;
}
+ public Builder addIgnoredReadOnlyWritePath(String path) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Builder setPartialReadOnly(boolean partialReadOnly) {
+ // only read only partials are supported
+ return this;
+ }
+
+ public void assertPartialMountsAreReadOnly() {
+ List<String> readWriteMountNames = nonDefaultStores
+ .stream()
+ .map(MountedNodeStore::getMount)
+ .filter(m -> !m.isReadOnly())
+ .map(Mount::getName)
+ .collect(Collectors.toList());
+
+ checkArgument(readWriteMountNames.isEmpty(),
+ "Following partial mounts are write-enabled: ", readWriteMountNames);
+ }
+
public CompositeNodeStore build() {
checkMountsAreConsistentWithMounts();
if (checks != null) {
Modified: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java?rev=1842613&r1=1842612&r2=1842613&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java Tue Oct 2 11:51:14 2018
@@ -55,7 +55,7 @@
* This is obviously correct but may be slow.
* {@link org.apache.jackrabbit.oak.composite.CompositionContext#getContributingStores(java.lang.String, java.util.function.Function)}
*/
-@Version("1.0.0")
+@Version("0.3.0")
package org.apache.jackrabbit.oak.composite;
import org.osgi.annotation.versioning.Version;
\ No newline at end of file