Refactor transaction support in preparation for migration to latest APIs
- Added a explicit transaction id type
- cli command now just returns the identifiers of in-progress transactions
- Removed redriveTransactions until a better alternative is provided
- Removed DatabaseUpdate and replaced its usage with MapUpdate
Change-Id: Ic4a14967072068834510cd8459fd2a6790e456ef
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/DefaultAsyncConsistentMapTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/DefaultAsyncConsistentMapTest.java
index a630d1a..68e7ecb 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/DefaultAsyncConsistentMapTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/impl/DefaultAsyncConsistentMapTest.java
@@ -41,7 +41,6 @@
import org.onosproject.core.ApplicationId;
import org.onosproject.core.DefaultApplicationId;
import org.onosproject.store.service.Serializer;
-import org.onosproject.store.service.Transaction;
import org.onosproject.store.service.Versioned;
import com.google.common.base.MoreObjects;
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 5711a88..21d8edc 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
@@ -27,6 +27,8 @@
import org.junit.Ignore;
import org.junit.Test;
import org.onlab.util.Tools;
+import org.onosproject.store.primitives.TransactionId;
+import org.onosproject.store.primitives.impl.Transaction;
import org.onosproject.store.service.MapEvent;
import org.onosproject.store.service.MapEventListener;
import org.onosproject.store.service.Versioned;
@@ -351,10 +353,9 @@
.withValue(value1)
.build();
- TransactionalMapUpdate<String, byte[]> txMapUpdate =
- new TransactionalMapUpdate<>(TransactionId.from("tx1"), Arrays.asList(update1));
+ Transaction tx = new Transaction(TransactionId.from("tx1"), Arrays.asList(update1));
- map.prepare(txMapUpdate).thenAccept(result -> {
+ map.prepare(tx).thenAccept(result -> {
assertEquals(PrepareResult.OK, result);
}).join();
assertNull(listener.event());
@@ -376,7 +377,7 @@
assertNull(listener.event());
- map.commit(txMapUpdate.transactionId()).join();
+ map.commit(tx.id()).join();
assertNotNull(listener.event());
assertEquals(MapEvent.Type.INSERT, listener.event().type());
assertTrue(Arrays.equals(value1, listener.event().newValue().value()));
@@ -406,14 +407,13 @@
.withKey("foo")
.withValue(value1)
.build();
- TransactionalMapUpdate<String, byte[]> txMapUpdate =
- new TransactionalMapUpdate<>(TransactionId.from("tx1"), Arrays.asList(update1));
- map.prepare(txMapUpdate).thenAccept(result -> {
+ Transaction tx = new Transaction(TransactionId.from("tx1"), Arrays.asList(update1));
+ map.prepare(tx).thenAccept(result -> {
assertEquals(PrepareResult.OK, result);
}).join();
assertNull(listener.event());
- map.rollback(txMapUpdate.transactionId()).join();
+ map.rollback(tx.id()).join();
assertNull(listener.event());
map.get("foo").thenAccept(result -> {
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/MapUpdateTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/MapUpdateTest.java
new file mode 100644
index 0000000..6a0db93
--- /dev/null
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/MapUpdateTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015 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 com.google.common.testing.EqualsTester;
+import org.junit.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Unit Tests for MapUpdate class.
+ */
+
+public class MapUpdateTest {
+
+ private final MapUpdate<String, byte[]> stats1 = MapUpdate.<String, byte[]>newBuilder()
+ .withCurrentValue("1".getBytes())
+ .withValue("2".getBytes())
+ .withCurrentVersion(3)
+ .withKey("4")
+ .withMapName("5")
+ .withType(MapUpdate.Type.PUT)
+ .build();
+
+ private final MapUpdate<String, byte[]> stats2 = MapUpdate.<String, byte[]>newBuilder()
+ .withCurrentValue("1".getBytes())
+ .withValue("2".getBytes())
+ .withCurrentVersion(3)
+ .withKey("4")
+ .withMapName("5")
+ .withType(MapUpdate.Type.REMOVE)
+ .build();
+
+ private final MapUpdate<String, byte[]> stats3 = MapUpdate.<String, byte[]>newBuilder()
+ .withCurrentValue("1".getBytes())
+ .withValue("2".getBytes())
+ .withCurrentVersion(3)
+ .withKey("4")
+ .withMapName("5")
+ .withType(MapUpdate.Type.REMOVE_IF_VALUE_MATCH)
+ .build();
+
+ private final MapUpdate<String, byte[]> stats4 = MapUpdate.<String, byte[]>newBuilder()
+ .withCurrentValue("1".getBytes())
+ .withValue("2".getBytes())
+ .withCurrentVersion(3)
+ .withKey("4")
+ .withMapName("5")
+ .withType(MapUpdate.Type.REMOVE_IF_VERSION_MATCH)
+ .build();
+
+ private final MapUpdate<String, byte[]> stats5 = MapUpdate.<String, byte[]>newBuilder()
+ .withCurrentValue("1".getBytes())
+ .withValue("2".getBytes())
+ .withCurrentVersion(3)
+ .withKey("4")
+ .withMapName("5")
+ .withType(MapUpdate.Type.PUT_IF_VALUE_MATCH)
+ .build();
+
+ private final MapUpdate<String, byte[]> stats6 = MapUpdate.<String, byte[]>newBuilder()
+ .withCurrentValue("1".getBytes())
+ .withValue("2".getBytes())
+ .withCurrentVersion(3)
+ .withKey("4")
+ .withMapName("5")
+ .withType(MapUpdate.Type.PUT_IF_VERSION_MATCH)
+ .build();
+
+ /**
+ * Tests the constructor for the class.
+ */
+ @Test
+ public void testConstruction() {
+ assertThat(stats1.currentValue(), is("1".getBytes()));
+ 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));
+ }
+
+ /**
+ * Tests the equals, hashCode and toString methods using Guava EqualsTester.
+ */
+ @Test
+ public void testEquals() {
+ new EqualsTester()
+ .addEqualityGroup(stats1, stats1)
+ .addEqualityGroup(stats2)
+ .testEquals();
+
+ new EqualsTester()
+ .addEqualityGroup(stats3, stats3)
+ .addEqualityGroup(stats4)
+ .testEquals();
+
+ new EqualsTester()
+ .addEqualityGroup(stats5, stats5)
+ .addEqualityGroup(stats6)
+ .testEquals();
+ }
+
+ /**
+ * Tests if the toString method returns a consistent value for hashing.
+ */
+ @Test
+ public void testToString() {
+ assertThat(stats1.toString(), is(stats1.toString()));
+ }
+
+}