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/main/java/org/onosproject/store/primitives/resources/impl/MapUpdate.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/MapUpdate.java
index c105a08..dc80c56 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/MapUpdate.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/MapUpdate.java
@@ -70,6 +70,7 @@
REMOVE_IF_VALUE_MATCH,
}
+ private String mapName;
private Type type;
private K key;
private V value;
@@ -77,6 +78,15 @@
private long currentVersion = -1;
/**
+ * Returns the name of the map.
+ *
+ * @return map name
+ */
+ public String mapName() {
+ return mapName;
+ }
+
+ /**
* Returns the type of update operation.
* @return type of update.
*/
@@ -119,6 +129,7 @@
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
+ .add("mapName", mapName)
.add("type", type)
.add("key", key)
.add("value", value)
@@ -153,6 +164,11 @@
return update;
}
+ public Builder<K, V> withMapName(String name) {
+ update.mapName = checkNotNull(name, "name cannot be null");
+ return this;
+ }
+
public Builder<K, V> withType(Type type) {
update.type = checkNotNull(type, "type cannot be null");
return this;