Partitioned DocumentTree primitive
Change-Id: I7e1712e1b7103756f9c8c6ad7118f8da5bb0fa2f
diff --git a/core/api/src/main/java/org/onosproject/store/service/DocumentPath.java b/core/api/src/main/java/org/onosproject/store/service/DocumentPath.java
index a5e1eaa..333cbb1 100644
--- a/core/api/src/main/java/org/onosproject/store/service/DocumentPath.java
+++ b/core/api/src/main/java/org/onosproject/store/service/DocumentPath.java
@@ -45,6 +45,9 @@
private static String pathSeparator = DEFAULT_SEPARATOR;
private static String pathSeparatorRE = DEFAULT_SEPARATOR_RE;
+ /** Root document tree path. */
+ public static final DocumentPath ROOT = DocumentPath.from("root");
+
private final List<String> pathElements = Lists.newArrayList();
/**
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/FederatedDistributedPrimitiveCreator.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/FederatedDistributedPrimitiveCreator.java
index 8f45628..b7bb8f6 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/FederatedDistributedPrimitiveCreator.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/FederatedDistributedPrimitiveCreator.java
@@ -15,6 +15,12 @@
*/
package org.onosproject.store.primitives.impl;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.function.Function;
+
import com.google.common.base.Charsets;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -34,16 +40,11 @@
import org.onosproject.store.service.AsyncDistributedSet;
import org.onosproject.store.service.AsyncDocumentTree;
import org.onosproject.store.service.AsyncLeaderElector;
+import org.onosproject.store.service.DocumentPath;
import org.onosproject.store.service.Ordering;
import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.WorkQueue;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.function.Function;
-
import static com.google.common.base.Preconditions.checkNotNull;
/**
@@ -141,7 +142,15 @@
@Override
public <V> AsyncDocumentTree<V> newAsyncDocumentTree(String name, Serializer serializer, Ordering ordering) {
- return getCreator(name).newAsyncDocumentTree(name, serializer, ordering);
+ checkNotNull(name);
+ checkNotNull(serializer);
+ Map<PartitionId, AsyncDocumentTree<V>> trees =
+ Maps.transformValues(members, partition -> partition.<V>newAsyncDocumentTree(name, serializer));
+ Hasher<DocumentPath> hasher = key -> {
+ int bucket = Math.abs(Hashing.murmur3_32().hashUnencodedChars(key.toString()).asInt()) % buckets;
+ return sortedMemberPartitionIds.get(Hashing.consistentHash(bucket, sortedMemberPartitionIds.size()));
+ };
+ return new PartitionedAsyncDocumentTree<>(name, trees, hasher);
}
@Override
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/PartitionedAsyncDocumentTree.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/PartitionedAsyncDocumentTree.java
new file mode 100644
index 0000000..3c53e30
--- /dev/null
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/PartitionedAsyncDocumentTree.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.store.primitives.impl;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Maps;
+import org.onlab.util.Tools;
+import org.onosproject.cluster.PartitionId;
+import org.onosproject.store.primitives.NodeUpdate;
+import org.onosproject.store.primitives.TransactionId;
+import org.onosproject.store.service.AsyncDocumentTree;
+import org.onosproject.store.service.DocumentPath;
+import org.onosproject.store.service.DocumentTreeListener;
+import org.onosproject.store.service.NoSuchDocumentPathException;
+import org.onosproject.store.service.TransactionLog;
+import org.onosproject.store.service.Version;
+import org.onosproject.store.service.Versioned;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Partitioned asynchronous document tree.
+ */
+public class PartitionedAsyncDocumentTree<V> implements AsyncDocumentTree<V> {
+
+ private final String name;
+ private final TreeMap<PartitionId, AsyncDocumentTree<V>> partitions = Maps.newTreeMap();
+ private final Hasher<DocumentPath> pathHasher;
+
+ public PartitionedAsyncDocumentTree(
+ String name,
+ Map<PartitionId, AsyncDocumentTree<V>> partitions,
+ Hasher<DocumentPath> pathHasher) {
+ this.name = name;
+ this.partitions.putAll(checkNotNull(partitions));
+ this.pathHasher = checkNotNull(pathHasher);
+ }
+
+ @Override
+ public String name() {
+ return name;
+ }
+
+ @Override
+ public DocumentPath root() {
+ return DocumentPath.ROOT;
+ }
+
+ /**
+ * Returns the document tree (partition) to which the specified path maps.
+ *
+ * @param path path
+ * @return AsyncConsistentMap to which path maps
+ */
+ private AsyncDocumentTree<V> partition(DocumentPath path) {
+ return partitions.get(pathHasher.hash(path));
+ }
+
+ /**
+ * Returns all the constituent trees.
+ *
+ * @return collection of partitions.
+ */
+ private Collection<AsyncDocumentTree<V>> partitions() {
+ return partitions.values();
+ }
+
+ @Override
+ public CompletableFuture<Map<String, Versioned<V>>> getChildren(DocumentPath path) {
+ return Tools.allOf(partitions().stream()
+ .map(partition -> partition.getChildren(path).exceptionally(r -> null))
+ .collect(Collectors.toList())).thenApply(allChildren -> {
+ Map<String, Versioned<V>> children = Maps.newLinkedHashMap();
+ allChildren.stream().filter(Objects::nonNull).forEach(children::putAll);
+ return children;
+ });
+ }
+
+ @Override
+ public CompletableFuture<Versioned<V>> get(DocumentPath path) {
+ return partition(path).get(path);
+ }
+
+ @Override
+ public CompletableFuture<Versioned<V>> set(DocumentPath path, V value) {
+ return partition(path).set(path, value);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> create(DocumentPath path, V value) {
+ // TODO: This operation is not atomic
+ return partition(path.parent()).get(path).thenCompose(parentValue -> {
+ if (parentValue == null) {
+ return Tools.exceptionalFuture(new NoSuchDocumentPathException(path.parent().toString()));
+ } else {
+ return partition(path).createRecursive(path, value);
+ }
+ });
+ }
+
+ @Override
+ public CompletableFuture<Boolean> createRecursive(DocumentPath path, V value) {
+ return partition(path).createRecursive(path, value);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> replace(DocumentPath path, V newValue, long version) {
+ return partition(path).replace(path, newValue, version);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> replace(DocumentPath path, V newValue, V currentValue) {
+ return partition(path).replace(path, newValue, currentValue);
+ }
+
+ @Override
+ public CompletableFuture<Versioned<V>> removeNode(DocumentPath path) {
+ return partition(path).removeNode(path);
+ }
+
+ @Override
+ public CompletableFuture<Void> addListener(DocumentPath path, DocumentTreeListener<V> listener) {
+ return CompletableFuture.allOf(partitions().stream()
+ .map(map -> map.addListener(path, listener))
+ .toArray(CompletableFuture[]::new));
+ }
+
+ @Override
+ public CompletableFuture<Void> removeListener(DocumentTreeListener<V> listener) {
+ return CompletableFuture.allOf(partitions().stream()
+ .map(map -> map.removeListener(listener))
+ .toArray(CompletableFuture[]::new));
+ }
+
+ @Override
+ public CompletableFuture<Version> begin(TransactionId transactionId) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public CompletableFuture<Boolean> prepare(TransactionLog<NodeUpdate<V>> transactionLog) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public CompletableFuture<Boolean> prepareAndCommit(TransactionLog<NodeUpdate<V>> transactionLog) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public CompletableFuture<Void> commit(TransactionId transactionId) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public CompletableFuture<Void> rollback(TransactionId transactionId) {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTree.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTree.java
index b8c1248..eadaa7e 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTree.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTree.java
@@ -103,7 +103,7 @@
@Override
public DocumentPath root() {
- return DocumentPath.from("root");
+ return DocumentPath.ROOT;
}
@Override