X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FTable.h;h=7cc98abc2ff24dae7f6be3a777b36c2ed0a8d591;hp=a5ea0dc9b3c4095f1c49bca3c4c36d3ed20b37e2;hb=1982d44395bc486667d8b25d6d7763c2ffbf61bc;hpb=6ab6933678c5fe60b9705789584c1d102752fa5b

diff --git a/version2/src/C/Table.h b/version2/src/C/Table.h
index a5ea0dc..7cc98ab 100644
--- a/version2/src/C/Table.h
+++ b/version2/src/C/Table.h
@@ -65,12 +65,12 @@ private:
 	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<IoTString *, int64_t> *arbitratorTable;// Table of keys and their arbitrators
-	Hashtable<Pair<int64_t, int64_t>, Abort *> *liveAbortTable;// Table live abort messages
-	Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t>, TransactionPart *> *> *newTransactionParts;	// transaction parts that are seen in this latest round of slots from the server
-	Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t>, CommitPart *> *> *newCommitParts;	// commit parts that are seen in this latest round of slots from the server
+	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
+	Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t>, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals> *> *newCommitParts;	// commit parts that are seen in this latest round of slots from the server
 	Hashtable<int64_t, int64_t> *lastArbitratedTransactionNumberByArbitratorTable;	// Last transaction sequence number that an arbitrator arbitrated on
 	Hashtable<int64_t, Transaction *> *liveTransactionBySequenceNumberTable;	// live transaction grouped by the sequence number
-	Hashtable<Pair<int64_t, int64_t>, Transaction *> *liveTransactionByTransactionIdTable;	// live transaction grouped by the transaction ID
+	Hashtable<Pair<int64_t, int64_t>, Transaction *, uintptr_t, 0, pairHashFunction, pairEquals> *liveTransactionByTransactionIdTable;	// live transaction grouped by the transaction ID
 	Hashtable<int64_t, Hashtable<int64_t, Commit *> > *liveCommitsTable;
 	Hashtable<IoTString *, Commit *> *liveCommitsByKeyTable;
 	Hashtable<int64_t, int64_t> *lastCommitSeenSequenceNumberByArbitratorTable;
@@ -81,7 +81,7 @@ private:
 	Hashtable<Transaction *, Vector<int32_t> *> *transactionPartsSent;
 	Hashtable<int64_t, TransactionStatus *> *outstandingTransactionStatus;
 	Hashtable<int64_t, Abort *> *liveAbortsGeneratedByLocal;
-	Hashset<Pair<int64_t, int64_t> > *offlineTransactionsCommittedAndAtServer;
+	Hashset<Pair<int64_t, int64_t>, uintptr_t, 0, pairHashFunction, pairEquals> *offlineTransactionsCommittedAndAtServer;
 	Hashtable<int64_t, Pair<IoTString *, int32_t> > *localCommunicationTable;
 	Hashtable<int64_t, int64_t> *lastTransactionSeenFromMachineFromServer;
 	Hashtable<int64_t, int64_t> *lastArbitrationDataLocalSequenceNumberSeenFromArbitrator;