[ONOS-6342] Refactor transaction architecture to support a shared cache for transactional primitives
Change-Id: I2a17965100895f5aa4d2202028047bb980c11d26
diff --git a/core/api/src/test/java/org/onosproject/store/primitives/MapUpdateTest.java b/core/api/src/test/java/org/onosproject/store/primitives/MapUpdateTest.java
index 6fecd8c..53cc160 100644
--- a/core/api/src/test/java/org/onosproject/store/primitives/MapUpdateTest.java
+++ b/core/api/src/test/java/org/onosproject/store/primitives/MapUpdateTest.java
@@ -33,7 +33,6 @@
.withValue("2".getBytes())
.withCurrentVersion(3)
.withKey("4")
- .withMapName("5")
.withType(MapUpdate.Type.PUT)
.build();
@@ -42,7 +41,6 @@
.withValue("2".getBytes())
.withCurrentVersion(3)
.withKey("4")
- .withMapName("5")
.withType(MapUpdate.Type.REMOVE)
.build();
@@ -51,7 +49,6 @@
.withValue("2".getBytes())
.withCurrentVersion(3)
.withKey("4")
- .withMapName("5")
.withType(MapUpdate.Type.REMOVE_IF_VALUE_MATCH)
.build();
@@ -60,7 +57,6 @@
.withValue("2".getBytes())
.withCurrentVersion(3)
.withKey("4")
- .withMapName("5")
.withType(MapUpdate.Type.REMOVE_IF_VERSION_MATCH)
.build();
@@ -69,7 +65,6 @@
.withValue("2".getBytes())
.withCurrentVersion(3)
.withKey("4")
- .withMapName("5")
.withType(MapUpdate.Type.PUT_IF_VALUE_MATCH)
.build();
@@ -78,7 +73,6 @@
.withValue("2".getBytes())
.withCurrentVersion(3)
.withKey("4")
- .withMapName("5")
.withType(MapUpdate.Type.PUT_IF_VERSION_MATCH)
.build();
@@ -91,7 +85,6 @@
assertThat(stats1.value(), is("2".getBytes()));
assertThat(stats1.currentVersion(), is(3L));
assertThat(stats1.key(), is("4"));
- assertThat(stats1.mapName(), is("5"));
assertThat(stats1.type(), is(MapUpdate.Type.PUT));
}
diff --git a/core/api/src/test/java/org/onosproject/store/service/AsyncConsistentMapAdapter.java b/core/api/src/test/java/org/onosproject/store/service/AsyncConsistentMapAdapter.java
index c9161a3..90b4f51 100644
--- a/core/api/src/test/java/org/onosproject/store/service/AsyncConsistentMapAdapter.java
+++ b/core/api/src/test/java/org/onosproject/store/service/AsyncConsistentMapAdapter.java
@@ -24,6 +24,7 @@
import java.util.function.BiFunction;
import java.util.function.Predicate;
+import org.onosproject.store.primitives.MapUpdate;
import org.onosproject.store.primitives.TransactionId;
/**
@@ -143,7 +144,17 @@
}
@Override
- public CompletableFuture<Boolean> prepare(MapTransaction<K, V> transaction) {
+ public CompletableFuture<Version> begin(TransactionId transactionId) {
+ return null;
+ }
+
+ @Override
+ public CompletableFuture<Boolean> prepare(TransactionLog<MapUpdate<K, V>> transactionLog) {
+ return null;
+ }
+
+ @Override
+ public CompletableFuture<Boolean> prepareAndCommit(TransactionLog<MapUpdate<K, V>> transactionLog) {
return null;
}
@@ -156,10 +167,5 @@
public CompletableFuture<Void> rollback(TransactionId transactionId) {
return null;
}
-
- @Override
- public CompletableFuture<Boolean> prepareAndCommit(MapTransaction<K, V> transaction) {
- return null;
- }
}
diff --git a/core/api/src/test/java/org/onosproject/store/service/VersionTest.java b/core/api/src/test/java/org/onosproject/store/service/VersionTest.java
new file mode 100644
index 0000000..1495ec3
--- /dev/null
+++ b/core/api/src/test/java/org/onosproject/store/service/VersionTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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.service;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+/**
+ * Version test.
+ */
+public class VersionTest {
+
+ @Test
+ public void testVersion() {
+ Version version1 = new Version(1);
+ Version version2 = new Version(1);
+ assertTrue(version1.equals(version2));
+ assertTrue(version1.hashCode() == version2.hashCode());
+ assertTrue(version1.value() == version2.value());
+
+ Version version3 = new Version(2);
+ assertFalse(version1.equals(version3));
+ assertFalse(version1.hashCode() == version3.hashCode());
+ assertFalse(version1.value() == version3.value());
+ }
+
+}