X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=version2%2Fsrc%2FC%2FTable.h;h=a5ea0dc9b3c4095f1c49bca3c4c36d3ed20b37e2;hb=3e54762d57367b1ce049830b42f00950055d8527;hp=3f522144e983df2ed461114f7ec91ab5df05fc5b;hpb=151413d447b9302ee57b5d3276ef73e4b297fdc0;p=iotcloud.git

diff --git a/version2/src/C/Table.h b/version2/src/C/Table.h
index 3f52214..a5ea0dc 100644
--- a/version2/src/C/Table.h
+++ b/version2/src/C/Table.h
@@ -62,15 +62,15 @@ private:
 	Hashtable<IoTString *, KeyValue *> *speculatedKeyValueTable;	// Table of speculated key value pairs, if there is a speculative value
 	Hashtable<IoTString *, KeyValue *> *pendingTransactionSpeculatedKeyValueTable;	// Table of speculated key value pairs, if there is a speculative value from the pending transactions
 	Hashtable<IoTString *, NewKey *> *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, 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 *> *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<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 *> *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> > *offlineTransactionsCommittedAndAtServer;
 	Hashtable<int64_t, Pair<IoTString *, int32_t> > *localCommunicationTable;
 	Hashtable<int64_t, int64_t> *lastTransactionSeenFromMachineFromServer;
 	Hashtable<int64_t, int64_t> *lastArbitrationDataLocalSequenceNumberSeenFromArbitrator;
@@ -97,11 +97,11 @@ private:
 	bool sendToServer(NewKey *newKey);
 	bool updateFromLocal(int64_t machineId);
 	Pair<bool, bool> sendTransactionToLocal(Transaction *transaction);
-	ThreeTuple<bool, bool, Array<Slot *> *> *sendSlotsToServer(Slot *slot, int newSize, bool isNewKey);
+	ThreeTuple<bool, bool, Array<Slot *> *> sendSlotsToServer(Slot *slot, int newSize, bool isNewKey);
 	/**
 	 * Returns false if a resize was needed
 	 */
-	ThreeTuple<bool, int32_t, bool> *fillSlot(Slot *slot, bool resize, NewKey *newKeyEntry);
+	ThreeTuple<bool, int32_t, bool> fillSlot(Slot *slot, bool resize, NewKey *newKeyEntry);
 	void doRejectedMessages(Slot *s);
 
 	ThreeTuple<bool, bool, int64_t> doMandatoryResuce(Slot *slot, bool resize);