Refactor AtomixConsistentMap to use separate operations per method call for better performance and control over operation semantics.
Change-Id: I948c5c73d4ab38c9c2b20f8c80ba01548f95dda6
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapServiceTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapServiceTest.java
index 098c193..ecd8086 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapServiceTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapServiceTest.java
@@ -26,14 +26,14 @@
import io.atomix.storage.StorageLevel;
import io.atomix.time.WallClockTimestamp;
import org.junit.Test;
-import org.onlab.util.Match;
import org.onosproject.store.service.Versioned;
import static org.easymock.EasyMock.mock;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotNull;
import static org.onosproject.store.primitives.resources.impl.AtomixConsistentMapOperations.GET;
-import static org.onosproject.store.primitives.resources.impl.AtomixConsistentMapOperations.UPDATE_AND_GET;
+import static org.onosproject.store.primitives.resources.impl.AtomixConsistentMapOperations.PUT;
+import static org.onosproject.store.primitives.resources.impl.AtomixConsistentMapOperations.Put;
/**
* Consistent map service test.
@@ -49,10 +49,10 @@
Snapshot snapshot = store.newSnapshot(ServiceId.from(1), 2, new WallClockTimestamp());
AtomixConsistentMapService service = new AtomixConsistentMapService();
- service.updateAndGet(new DefaultCommit<>(
+ service.put(new DefaultCommit<>(
2,
- UPDATE_AND_GET,
- new AtomixConsistentMapOperations.UpdateAndGet("foo", "Hello world!".getBytes(), Match.ANY, Match.ANY),
+ PUT,
+ new Put("foo", "Hello world!".getBytes()),
mock(RaftSessionContext.class),
System.currentTimeMillis()));
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
index e858b3f..7b26f8b 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
@@ -255,7 +255,7 @@
map.computeIfPresent("bar", (k, v) -> value2).thenAccept(result -> {
assertNull(result);
- });
+ }).join();
map.computeIfPresent("foo", (k, v) -> value3).thenAccept(result -> {
assertTrue(Arrays.equals(Versioned.valueOrElse(result, null), value3));
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapServiceTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapServiceTest.java
deleted file mode 100644
index 04698e0..0000000
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapServiceTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Laboratory
- *
- * 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.resources.impl;
-
-import io.atomix.protocols.raft.service.ServiceId;
-import io.atomix.protocols.raft.service.impl.DefaultCommit;
-import io.atomix.protocols.raft.session.impl.RaftSessionContext;
-import io.atomix.protocols.raft.storage.RaftStorage;
-import io.atomix.protocols.raft.storage.snapshot.Snapshot;
-import io.atomix.protocols.raft.storage.snapshot.SnapshotReader;
-import io.atomix.protocols.raft.storage.snapshot.SnapshotStore;
-import io.atomix.protocols.raft.storage.snapshot.SnapshotWriter;
-import io.atomix.storage.StorageLevel;
-import io.atomix.time.WallClockTimestamp;
-import org.junit.Test;
-import org.onlab.util.Match;
-import org.onosproject.store.service.Versioned;
-
-import static org.easymock.EasyMock.mock;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.onosproject.store.primitives.resources.impl.AtomixConsistentTreeMapOperations.GET;
-import static org.onosproject.store.primitives.resources.impl.AtomixConsistentTreeMapOperations.UPDATE_AND_GET;
-
-/**
- * Consistent tree map service test.
- */
-public class AtomixConsistentTreeMapServiceTest {
- @Test
- @SuppressWarnings("unchecked")
- public void testSnapshot() throws Exception {
- SnapshotStore store = new SnapshotStore(RaftStorage.newBuilder()
- .withPrefix("test")
- .withStorageLevel(StorageLevel.MEMORY)
- .build());
- Snapshot snapshot = store.newSnapshot(ServiceId.from(1), 2, new WallClockTimestamp());
-
- AtomixConsistentTreeMapService service = new AtomixConsistentTreeMapService();
- service.updateAndGet(new DefaultCommit<>(
- 2,
- UPDATE_AND_GET,
- new AtomixConsistentTreeMapOperations.UpdateAndGet(
- "foo", "Hello world!".getBytes(), Match.ANY, Match.ANY),
- mock(RaftSessionContext.class),
- System.currentTimeMillis()));
-
- try (SnapshotWriter writer = snapshot.openWriter()) {
- service.snapshot(writer);
- }
-
- snapshot.complete();
-
- service = new AtomixConsistentTreeMapService();
- try (SnapshotReader reader = snapshot.openReader()) {
- service.install(reader);
- }
-
- Versioned<byte[]> value = service.get(new DefaultCommit<>(
- 2,
- GET,
- new AtomixConsistentTreeMapOperations.Get("foo"),
- mock(RaftSessionContext.class),
- System.currentTimeMillis()));
- assertNotNull(value);
- assertArrayEquals("Hello world!".getBytes(), value.value());
- }
-}
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java
index f1de625..7e8eec7 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentTreeMapTest.java
@@ -180,7 +180,6 @@
map.putAndGet(key, allValues.get(allKeys.indexOf(key))).thenAccept(secondResult -> {
assertArrayEquals(allValues.get(allKeys.indexOf(key)), firstResult.value());
assertArrayEquals(allValues.get(allKeys.indexOf(key)), secondResult.value());
- assertTrue((firstResult.version() + 1) == secondResult.version());
});
}).join());
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
index e117ba5..dbfee3c 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
@@ -176,7 +176,6 @@
.register(AtomixConsistentMapOperations.class)
.register(AtomixConsistentSetMultimapOperations.class)
.register(AtomixConsistentSetMultimapEvents.class)
- .register(AtomixConsistentTreeMapEvents.class)
.register(AtomixConsistentTreeMapOperations.class)
.register(AtomixCounterOperations.class)
.register(AtomixDocumentTreeEvents.class)