edits

[iotcloud.git] / version2 / src / C / Table.h

diff --git a/version2/src/C/Table.h b/version2/src/C/Table.h
old mode 100644 (file)
new mode 100755 (executable)
index 7133277..6df2fd7
--- a/version2/src/C/Table.h
+++ b/version2/src/C/Table.h
@@ -54,8 +54,8 @@ private:
        Slot *lastSlotAttemptedToSend;
        bool lastIsNewKey;
        int lastNewSize;
-       Hashtable<Transaction *, Vector<int32_t> *> *lastTransactionPartsSent;
-       Vector<Entry *> *lastPendingSendArbitrationEntriesToDelete;
+       Hashtable<Transaction *, MyVector<int32_t> *> *lastTransactionPartsSent;
+       MyVector<Entry *> *lastPendingSendArbitrationEntriesToDelete;
        NewKey *lastNewKey;
        void processTransactionList(bool handlePartial);
        void clearSentParts();
@@ -66,7 +66,7 @@ private:
        Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals> *pendingTransactionSpeculatedKeyValueTable;  // Table of speculated key value pairs, if there is a speculative value from the pending transactions
        Hashtable<IoTString *, NewKey *, uintptr_t, 0, hashString, StringEquals> *liveNewKeyTable;      // Table of live new keys
        Hashtable<int64_t, Pair<int64_t, Liveness *> *> *lastMessageTable;      // Last message sent by a client machine id -> (Seq Num, Slot or LastMessage);
-       Hashtable<int64_t, Hashset<RejectedMessage *> *> *rejectedMessageWatchVectorTable;      // Table of machine Ids and the set of rejected messages they have not seen yet
+       Hashtable<int64_t, Hashset<RejectedMessage *> *> *rejectedMessageWatchMyVectorTable;    // Table of machine Ids and the set of rejected messages they have not seen yet
        Hashtable<IoTString *, int64_t, uintptr_t, 0, hashString, StringEquals> *arbitratorTable;// Table of keys and their arbitrators
        Hashtable<Pair<int64_t, int64_t> *, Abort *, uintptr_t, 0, pairHashFunction, pairEquals> *liveAbortTable;// Table live abort messages
        Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *> *newTransactionParts;  // transaction parts that are seen in this latest round of slots from the server
@@ -77,11 +77,11 @@ private:
        Hashtable<int64_t, Hashtable<int64_t, Commit *> *> *liveCommitsTable;
        Hashtable<IoTString *, Commit *, uintptr_t, 0, hashString, StringEquals> *liveCommitsByKeyTable;
        Hashtable<int64_t, int64_t> *lastCommitSeenSequenceNumberByArbitratorTable;
-       Vector<int64_t> *rejectedSlotVector;    // Vector of rejected slots that have yet to be sent to the server
-       Vector<Transaction *> *pendingTransactionQueue;
-       Vector<ArbitrationRound *> *pendingSendArbitrationRounds;
-       Vector<Entry *> *pendingSendArbitrationEntriesToDelete;
-       Hashtable<Transaction *, Vector<int32_t> *> *transactionPartsSent;
+       MyVector<int64_t> *rejectedSlotMyVector;        // MyVector of rejected slots that have yet to be sent to the server
+       MyVector<Transaction *> *pendingTransactionQueue;
+       MyVector<ArbitrationRound *> *pendingSendArbitrationRounds;
+       MyVector<Entry *> *pendingSendArbitrationEntriesToDelete;
+       Hashtable<Transaction *, MyVector<int32_t> *> *transactionPartsSent;
        Hashtable<int64_t, TransactionStatus *> *outstandingTransactionStatus;
        Hashtable<int64_t, Abort *> *liveAbortsGeneratedByLocal;
        Hashset<Pair<int64_t, int64_t> *, uintptr_t, 0, pairHashFunction, pairEquals> *offlineTransactionsCommittedAndAtServer;
@@ -234,7 +234,7 @@ private:
         * Add a rejected message entry to the watch set to keep track of which clients have seen that
         * rejected message entry and which have not.
         */
-       void addWatchVector(int64_t machineId, RejectedMessage *entry);
+       void addWatchMyVector(int64_t machineId, RejectedMessage *entry);
 
        /**
         * Check if the HMAC chain is not violated