X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FTransaction.h;h=dab4949a4e93b30a3f1dd53e6d3dc1a91a17718f;hp=ad3a341d27b9a2a0e72c34ff6de9fa3556939c75;hb=41ff9c95ca5d4b707386c1b7e66df033169bf68d;hpb=ec6b65ba09fe295c36621a3386cb2571a8833203

diff --git a/version2/src/C/Transaction.h b/version2/src/C/Transaction.h
index ad3a341..dab4949 100644
--- a/version2/src/C/Transaction.h
+++ b/version2/src/C/Transaction.h
@@ -6,7 +6,7 @@ class Transaction {
  private:
 	Hashtable<int32_t, TransactionPart *> parts = NULL;
 	Set<int32_t> missingParts = NULL;
-	List<int32_t> partsPendingSend = NULL;
+	Vector<int32_t> partsPendingSend = NULL;
   bool isComplete = false;
   bool hasLastPart = false;
 	Hashset<KeyValue *> * keyValueGuardSet = NULL;
@@ -26,10 +26,10 @@ class Transaction {
  bool hadServerFailure = false;
 
     public Transaction() {
-        parts = new HashMap<Integer, TransactionPart>();
+        parts = new Hashtable<int32_t, TransactionPart>();
         keyValueGuardSet = new HashSet<KeyValue>();
         keyValueUpdateSet = new HashSet<KeyValue>();
-        partsPendingSend = new ArrayList<Integer>();
+        partsPendingSend = new Vector<int32_t>();
     }
 
     public void addPartEncode(TransactionPart newPart) {
@@ -65,7 +65,7 @@ class Transaction {
             // Set dead the old one since the new one is a rescued version of this part
             previoslySeenPart.setDead();
         } else if (newPart.isLastPart()) {
-            missingParts = new HashSet<Integer>();
+            missingParts = new HashSet<int32_t>();
             hasLastPart = true;
 
             for (int i = 0; i < newPart.getPartNumber(); i++) {
@@ -108,7 +108,7 @@ class Transaction {
     public void setSequenceNumber(int64_t _sequenceNumber) {
         sequenceNumber = _sequenceNumber;
 
-        for (Integer i : parts.keySet()) {
+        for (int32_t i : parts.keySet()) {
             parts.get(i).setSequenceNumber(sequenceNumber);
         }
     }
@@ -117,7 +117,7 @@ class Transaction {
         return clientLocalSequenceNumber;
     }
 
-    public Map<Integer, TransactionPart> getParts() {
+    public Hashtable<int32_t, TransactionPart> getParts() {
         return parts;
     }
 
@@ -161,7 +161,7 @@ class Transaction {
         return transactionStatus;
     }
 
-    public void removeSentParts(List<Integer> sentParts) {
+    public void removeSentParts(Vector<int32_t> sentParts) {
         nextPartToSend = 0;
         if(partsPendingSend.removeAll(sentParts))
         {
@@ -194,7 +194,7 @@ class Transaction {
         return isComplete;
     }
 
-    public Pair<Long, Long> getId() {
+    public Pair<int64_t, int64_t> getId() {
         return transactionId;
     }
 
@@ -208,7 +208,7 @@ class Transaction {
         isDead = true;
 
         // Make all the parts of this transaction dead
-        for (Integer partNumber : parts.keySet()) {
+        for (int32_t partNumber : parts.keySet()) {
             TransactionPart part = parts.get(partNumber);
             part.setDead();
         }
@@ -257,7 +257,7 @@ class Transaction {
         }
     }
 
-    public bool evaluateGuard(Map<IoTString, KeyValue> committedKeyValueTable, Map<IoTString, KeyValue> speculatedKeyValueTable, Map<IoTString, KeyValue> pendingTransactionSpeculatedKeyValueTable) {
+    public bool evaluateGuard(Hashtable<IoTString, KeyValue> committedKeyValueTable, Hashtable<IoTString, KeyValue> speculatedKeyValueTable, Hashtable<IoTString, KeyValue> pendingTransactionSpeculatedKeyValueTable) {
         for (KeyValue kvGuard : keyValueGuardSet) {
 
             // First check if the key is in the speculative table, this is the value of the latest assumption