commit 74da78b62bbbff095c3e20c9e2a7ce7b0bc923a9
author Madan Jampani <madan.jampani@gmail.com> Tue Feb 09 21:18:36 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 10 21:48:12 2016 +0000
tree 41e21e4eef38ccd02e716b1c63c0078960f0873c
parent 1110b2cee62b97ec29570cc25eac4592b3544e56

AsyncConsistentMap methods for supporting transactional updates

Change-Id: Iaeb0aa0abf9f52d514a2c040598599a5b8a55ee8

core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java
index de22a75..e580fed 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapState.java
@@ -37,10 +37,11 @@
 
 import org.onlab.util.CountDownCompleter;
 import org.onlab.util.Match;
+import org.onosproject.store.primitives.MapUpdate;
 import org.onosproject.store.primitives.TransactionId;
-import org.onosproject.store.primitives.impl.Transaction;
 import org.onosproject.store.primitives.resources.impl.AtomixConsistentMapCommands.TransactionPrepare;
 import org.onosproject.store.service.MapEvent;
+import org.onosproject.store.service.MapTransaction;
 import org.onosproject.store.service.Versioned;
 
 import com.google.common.collect.Maps;
@@ -384,7 +385,7 @@
             Commit<? extends AtomixConsistentMapCommands.TransactionPrepare> commit) {
         boolean ok = false;
         try {
-            Transaction transaction = commit.operation().transaction();
+            MapTransaction<String, byte[]> transaction = commit.operation().transaction();
             for (MapUpdate<String, byte[]> update : transaction.updates()) {
                 String key = update.key();
                 if (preparedKeys.contains(key)) {
@@ -404,7 +405,7 @@
             // No violations detected. Add to pendingTranctions and mark
             // modified keys as
             // currently locked to updates.
-            pendingTransactions.put(transaction.id(), commit);
+            pendingTransactions.put(transaction.transactionId(), commit);
             transaction.updates().forEach(u -> preparedKeys.add(u.key()));
             ok = true;
             return PrepareResult.OK;
@@ -430,7 +431,7 @@
             if (prepareCommit == null) {
                 return CommitResult.UNKNOWN_TRANSACTION_ID;
             }
-            Transaction transaction = prepareCommit.operation().transaction();
+            MapTransaction<String, byte[]> transaction = prepareCommit.operation().transaction();
             long totalReferencesToCommit = transaction
                     .updates()
                     .stream()
@@ -610,7 +611,7 @@
 
         @Override
         public byte[] value() {
-            Transaction transaction = completer.object().operation().transaction();
+            MapTransaction<String, byte[]> transaction = completer.object().operation().transaction();
             return valueForKey(key, transaction);
         }
 
@@ -624,7 +625,7 @@
             completer.countDown();
         }
 
-        private byte[] valueForKey(String key, Transaction transaction) {
+        private byte[] valueForKey(String key, MapTransaction<String, byte[]> transaction) {
             MapUpdate<String, byte[]>  update = transaction.updates()
                                                            .stream()
                                                            .filter(u -> u.key().equals(key))