Upgrade to Atomix 3.0-rc5
* Upgrade Raft primitives to Atomix 3.0
* Replace cluster store and messaging implementations with Atomix cluster management/messaging
* Add test scripts for installing/starting Atomix cluster
* Replace core primitives with Atomix primitives.
Change-Id: I7623653c81292a34f21b01f5f38ca11b5ef15cad
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTree.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTree.java
new file mode 100644
index 0000000..4bbc822
--- /dev/null
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/AtomixDocumentTree.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2018-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.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Maps;
+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.DocumentTreeEvent;
+import org.onosproject.store.service.DocumentTreeListener;
+import org.onosproject.store.service.TransactionLog;
+import org.onosproject.store.service.Version;
+import org.onosproject.store.service.Versioned;
+
+/**
+ * Atomix document tree.
+ */
+public class AtomixDocumentTree<V> implements AsyncDocumentTree<V> {
+ private final io.atomix.core.tree.AsyncAtomicDocumentTree<V> atomixTree;
+ private final Map<DocumentTreeListener<V>, io.atomix.core.tree.DocumentTreeEventListener<V>> listenerMap =
+ Maps.newIdentityHashMap();
+
+ public AtomixDocumentTree(io.atomix.core.tree.AsyncAtomicDocumentTree<V> atomixTree) {
+ this.atomixTree = atomixTree;
+ }
+
+ @Override
+ public String name() {
+ return atomixTree.name();
+ }
+
+ @Override
+ public DocumentPath root() {
+ return toOnosPath(atomixTree.root());
+ }
+
+ @Override
+ public CompletableFuture<Map<String, Versioned<V>>> getChildren(DocumentPath path) {
+ return atomixTree.getChildren(toAtomixPath(path))
+ .thenApply(map -> map.entrySet().stream()
+ .collect(Collectors.toMap(e -> e.getKey(),
+ e -> toVersioned(e.getValue()))));
+ }
+
+ @Override
+ public CompletableFuture<Versioned<V>> get(DocumentPath path) {
+ return atomixTree.get(toAtomixPath(path)).thenApply(this::toVersioned);
+ }
+
+ @Override
+ public CompletableFuture<Versioned<V>> set(DocumentPath path, V value) {
+ return atomixTree.set(toAtomixPath(path), value).thenApply(this::toVersioned);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> create(DocumentPath path, V value) {
+ return atomixTree.create(toAtomixPath(path), value);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> createRecursive(DocumentPath path, V value) {
+ return atomixTree.createRecursive(toAtomixPath(path), value);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> replace(DocumentPath path, V newValue, long version) {
+ return atomixTree.replace(toAtomixPath(path), newValue, version);
+ }
+
+ @Override
+ public CompletableFuture<Boolean> replace(DocumentPath path, V newValue, V currentValue) {
+ return atomixTree.replace(toAtomixPath(path), newValue, currentValue);
+ }
+
+ @Override
+ public CompletableFuture<Versioned<V>> removeNode(DocumentPath path) {
+ return atomixTree.removeNode(toAtomixPath(path)).thenApply(this::toVersioned);
+ }
+
+ @Override
+ public synchronized CompletableFuture<Void> addListener(DocumentPath path, DocumentTreeListener<V> listener) {
+ io.atomix.core.tree.DocumentTreeEventListener<V> atomixListener = event ->
+ listener.event(new DocumentTreeEvent<V>(
+ DocumentPath.from(event.path().pathElements()),
+ DocumentTreeEvent.Type.valueOf(event.type().name()),
+ event.newValue().map(this::toVersioned),
+ event.oldValue().map(this::toVersioned)));
+ listenerMap.put(listener, atomixListener);
+ return atomixTree.addListener(toAtomixPath(path), atomixListener);
+ }
+
+ @Override
+ public CompletableFuture<Void> removeListener(DocumentTreeListener<V> listener) {
+ io.atomix.core.tree.DocumentTreeEventListener<V> atomixListener = listenerMap.remove(listener);
+ if (atomixListener != null) {
+ return atomixTree.removeListener(atomixListener);
+ }
+ return CompletableFuture.completedFuture(null);
+ }
+
+ @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();
+ }
+
+ private DocumentPath toOnosPath(io.atomix.core.tree.DocumentPath path) {
+ return DocumentPath.from(path.pathElements());
+ }
+
+ private io.atomix.core.tree.DocumentPath toAtomixPath(DocumentPath path) {
+ return io.atomix.core.tree.DocumentPath.from(path.pathElements());
+ }
+
+ private Versioned<V> toVersioned(io.atomix.utils.time.Versioned<V> versioned) {
+ return versioned != null
+ ? new Versioned<>(versioned.value(), versioned.version(), versioned.creationTime())
+ : null;
+ }
+}