edits

[iotcloud.git] / version2 / src / C / Commit.cc

diff --git a/version2/src/C/Commit.cc b/version2/src/C/Commit.cc
index 32e21756ce1846d5fa78f7f65f21548ab1c70b1c..a5b952d93b710249429768f036904683e0825c65 100644 (file)
--- a/version2/src/C/Commit.cc
+++ b/version2/src/C/Commit.cc
@@ -1,7 +1,7 @@
 #include "commit.h"
 
 Commit::Commit() :
 #include "commit.h"
 
 Commit::Commit() :

-       parts(new HashMap<int32_t, CommitPart *>()),
+       parts(new Hashtable<int32_t, CommitPart *>()),

        missingParts(NULL),
        fldisComplete(false),
        hasLastPart(false),
        missingParts(NULL),
        fldisComplete(false),
        hasLastPart(false),


@@ -15,7 +15,7 @@ Commit::Commit() :
 
 
 Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber) :
 
 
 Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber) :

-       parts(new HashMap<int32_t, CommitPart *>()),
+       parts(new Hashtable<int32_t, CommitPart *>()),

        missingParts(NULL),
        fldisComplete(true),
        hasLastPart(false),
        missingParts(NULL),
        fldisComplete(true),
        hasLastPart(false),


@@ -41,7 +41,7 @@ void Commit::addPartDecode(CommitPart newPart) {
                // Set dead the old one since the new one is a rescued version of this part
                previoslySeenPart.setDead();
        } else if (newPart.isLastPart()) {
                // 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++) {
                hasLastPart = true;
                
                for (int i = 0; i < newPart.getPartNumber(); i++) {


@@ -81,7 +81,7 @@ void Commit::addPartDecode(CommitPart newPart) {
         return transactionSequenceNumber;
     }
 
         return transactionSequenceNumber;
     }
 

-    Map<Integer, CommitPart> getParts() {
+    Hashtable<int32_t, CommitPart> getParts() {

         return parts;
     }
 
         return parts;
     }
 


@@ -116,7 +116,7 @@ int32_t getNumberOfParts() {
         isDead = true;
 
         // Make all the parts of this transaction dead
         isDead = true;
 
         // Make all the parts of this transaction dead

-        for (Integer partNumber : parts.keySet()) {
+        for (int32_t partNumber : parts.keySet()) {

             CommitPart part = parts.get(partNumber);
             part.setDead();
         }
             CommitPart part = parts.get(partNumber);
             part.setDead();
         }


@@ -218,7 +218,7 @@ int32_t getNumberOfParts() {
         return bbEncode.array();
     }
 
         return bbEncode.array();
     }
 

-    void setKVsMap(Map<IoTString, KeyValue> newKVs) {
+    void setKVsMap(Hashtable<IoTString, KeyValue> newKVs) {

         keyValueUpdateSet.clear();
         liveKeys.clear();
 
         keyValueUpdateSet.clear();
         liveKeys.clear();
 


@@ -236,7 +236,7 @@ int32_t getNumberOfParts() {
             return older;
         }
 
             return older;
         }
 

-        Map<IoTString, KeyValue> kvSet = new HashMap<IoTString, KeyValue>();
+        Hashtable<IoTString, KeyValue> kvSet = new Hashtable<IoTString, KeyValue>();

         for (KeyValue kv : older.getKeyValueUpdateSet()) {
             kvSet.put(kv.getKey(), kv);
         }
         for (KeyValue kv : older.getKeyValueUpdateSet()) {
             kvSet.put(kv.getKey(), kv);
         }