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/AtomixConsistentMapCommands.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java
index c463320..a5dd232 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapCommands.java
@@ -28,6 +28,8 @@
import java.util.Set;
import org.onlab.util.Match;
+import org.onosproject.store.primitives.TransactionId;
+import org.onosproject.store.primitives.impl.Transaction;
import org.onosproject.store.service.Versioned;
import com.google.common.base.MoreObjects;
@@ -207,35 +209,35 @@
*/
@SuppressWarnings("serial")
public static class TransactionPrepare extends MapCommand<PrepareResult> {
- private TransactionalMapUpdate<String, byte[]> update;
+ private Transaction transaction;
public TransactionPrepare() {
}
- public TransactionPrepare(TransactionalMapUpdate<String, byte[]> update) {
- this.update = update;
+ public TransactionPrepare(Transaction transaction) {
+ this.transaction = transaction;
}
- public TransactionalMapUpdate<String, byte[]> transactionUpdate() {
- return update;
+ public Transaction transaction() {
+ return transaction;
}
@Override
public void writeObject(BufferOutput<?> buffer, Serializer serializer) {
super.writeObject(buffer, serializer);
- serializer.writeObject(update, buffer);
+ serializer.writeObject(transaction, buffer);
}
@Override
public void readObject(BufferInput<?> buffer, Serializer serializer) {
super.readObject(buffer, serializer);
- update = serializer.readObject(buffer);
+ transaction = serializer.readObject(buffer);
}
@Override
public String toString() {
return MoreObjects.toStringHelper(getClass())
- .add("update", update)
+ .add("transaction", transaction)
.toString();
}
}