#include "TransactionStatus.h"
#include "Transaction.h"
#include "LastMessage.h"
-#include "Random.h"
+#include "SecureRandom.h"
#include "ByteBuffer.h"
#include "Abort.h"
#include "CommitPart.h"
#include "Commit.h"
#include "RejectedMessage.h"
#include "SlotIndexer.h"
+#include <stdlib.h>
+
+int compareInt64(const void *a, const void *b) {
+ const int64_t *pa = (const int64_t *) a;
+ const int64_t *pb = (const int64_t *) b;
+ if (*pa < *pb)
+ return -1;
+ else if (*pa > *pb)
+ return 1;
+ else
+ return 0;
+}
Table::Table(IoTString *baseurl, IoTString *password, int64_t _localMachineId, int listeningPort) :
buffer(NULL),
*/
void Table::init() {
// Init helper objects
- random = new Random();
+ random = new SecureRandom();
buffer = new SlotBuffer();
// init data structs
lastArbitratedTransactionNumberByArbitratorTable = new Hashtable<int64_t, int64_t>();
liveTransactionBySequenceNumberTable = new Hashtable<int64_t, Transaction *>();
liveTransactionByTransactionIdTable = new Hashtable<Pair<int64_t, int64_t> *, Transaction *, uintptr_t, 0, pairHashFunction, pairEquals>();
- liveCommitsTable = new Hashtable<int64_t, Hashtable<int64_t, Commit *> >();
+ liveCommitsTable = new Hashtable<int64_t, Hashtable<int64_t, Commit *> * >();
liveCommitsByKeyTable = new Hashtable<IoTString *, Commit *>();
lastCommitSeenSequenceNumberByArbitratorTable = new Hashtable<int64_t, int64_t>();
rejectedSlotVector = new Vector<int64_t>();
}
void Table::close() {
- cloud->close();
+ cloud->closeCloud();
}
IoTString *Table::getCommitted(IoTString *key) {
updateLiveTransactionsAndStatus();
return true;
} catch (Exception *e) {
- SetIterator<int64_t> *kit = getKeyIterator(localCommunicationTable);
+ SetIterator<int64_t, Pair<IoTString *, int32_t> *> *kit = getKeyIterator(localCommunicationTable);
while (kit->hasNext()) {
int64_t m = kit->next();
updateFromLocal(m);
}
}
- SetIterator<Transaction *> *trit = getKeyIterator(lastTransactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetServerFailure();
}
}
- SetIterator<Transaction *> *trit = getKeyIterator(lastTransactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetServerFailure();
}
}
- SetIterator<Transaction *> *trit = getKeyIterator(lastTransactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetServerFailure();
// Process each entry in the slot
Vector<Entry *> *entries = s->getEntries();
uint eSize = entries->size();
- for(uint ei=0; ei < eSize; ei++) {
- Entry * entry = entries->get(ei);
-
+ for (uint ei = 0; ei < eSize; ei++) {
+ Entry *entry = entries->get(ei);
+
if (entry->getType() == TypeLastMessage) {
LastMessage *lastMessage = (LastMessage *)entry;
if ((lastMessage->getMachineID() == localMachineId) && (lastMessage->getSequenceNumber() == lastSlotAttemptedToSend->getSequenceNumber())) {
}
}
- SetIterator<Transaction *> *trit = getKeyIterator(lastTransactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetServerFailure();
}
delete trit;
} else {
- SetIterator<Transaction *> *trit = getKeyIterator(lastTransactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetServerFailure();
if (needsResize) {
// Reset which transaction to send
- SetIterator<Transaction *> *trit = getKeyIterator(transactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
}
pendingSendArbitrationRounds->setSize(oldcount);
- SetIterator<Transaction *> *trit = getKeyIterator(transactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetServerFailure();
delete trit;
} else {
// Reset which transaction to send
- SetIterator<Transaction *> *trit = getKeyIterator(transactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
}
} catch (ServerException *e) {
- if (e->getType() != ServerException->TypeInputTimeout) {
+ if (e->getType() != ServerException_TypeInputTimeout) {
// Nothing was able to be sent to the server so just clear these data structures
- SetIterator<Transaction *> *trit = getKeyIterator(transactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
hadPartialSendToServer = true;
// Nothing was able to be sent to the server so just clear these data structures
- SetIterator<Transaction *> *trit = getKeyIterator(transactionPartsSent);
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
while (trit->hasNext()) {
Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
if (!localCommunicationTable->contains(machineId))
return false;
- Pair<IoTString *, int32_t> * localCommunicationInformation = localCommunicationTable->get(machineId);
+ Pair<IoTString *, int32_t> *localCommunicationInformation = localCommunicationTable->get(machineId);
// Get the size of the send data
int sendDataSize = sizeof(int32_t) + sizeof(int64_t);
int64_t lastArbitrationDataLocalSequenceNumber = (int64_t) -1;
- if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(machineId) != NULL) {
+ if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->contains(machineId)) {
lastArbitrationDataLocalSequenceNumber = lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(machineId);
}
bbEncode->putInt(0);
// Send by local
- Array<char> *returnData = cloud->sendLocalData(sendData, localSequenceNumber, localCommunicationInformation.getFirst(), localCommunicationInformation.getSecond());
+ Array<char> *returnData = cloud->sendLocalData(sendData, localSequenceNumber, localCommunicationInformation->getFirst(), localCommunicationInformation->getSecond());
localSequenceNumber++;
if (returnData == NULL) {
Pair<bool, bool> Table::sendTransactionToLocal(Transaction *transaction) {
// Get the devices local communications
- if (!localCommunicationTable->contains(machineId))
+ if (!localCommunicationTable->contains(transaction->getArbitrator()))
return Pair<bool, bool>(true, false);
-
- Pair<IoTString *, int32_t> localCommunicationInformation = localCommunicationTable->get(transaction->getArbitrator());
+
+ Pair<IoTString *, int32_t> *localCommunicationInformation = localCommunicationTable->get(transaction->getArbitrator());
// Get the size of the send data
int sendDataSize = sizeof(int32_t) + sizeof(int64_t);
- for (TransactionPart *part : transaction->getParts()->values()) {
- sendDataSize += part->getSize();
+ {
+ Vector<TransactionPart *> *tParts = transaction->getParts();
+ uint tPartsSize = tParts->size();
+ for (uint i = 0; i < tPartsSize; i++) {
+ TransactionPart *part = tParts->get(i);
+ sendDataSize += part->getSize();
+ }
}
int64_t lastArbitrationDataLocalSequenceNumber = (int64_t) -1;
- if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(transaction->getArbitrator()) != NULL) {
+ if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->contains(transaction->getArbitrator())) {
lastArbitrationDataLocalSequenceNumber = lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(transaction->getArbitrator());
}
// Encode the data
bbEncode->putLong(lastArbitrationDataLocalSequenceNumber);
bbEncode->putInt(transaction->getParts()->size());
- for (TransactionPart *part : transaction->getParts()->values()) {
- part->encode(bbEncode);
+ {
+ Vector<TransactionPart *> *tParts = transaction->getParts();
+ uint tPartsSize = tParts->size();
+ for (uint i = 0; i < tPartsSize; i++) {
+ TransactionPart *part = tParts->get(i);
+ part->encode(bbEncode);
+ }
}
-
// Send by local
- Array<char> *returnData = cloud->sendLocalData(sendData, localSequenceNumber, localCommunicationInformation.getFirst(), localCommunicationInformation.getSecond());
+ Array<char> *returnData = cloud->sendLocalData(sendData, localSequenceNumber, localCommunicationInformation->getFirst(), localCommunicationInformation->getSecond());
localSequenceNumber++;
if (returnData == NULL) {
updateLiveStateFromLocal();
if (couldArbitrate) {
- TransactionStatus * status = transaction->getTransactionStatus();
+ TransactionStatus *status = transaction->getTransactionStatus();
if (didCommit) {
status->setStatus(TransactionStatus_StatusCommitted);
} else {
status->setStatus(TransactionStatus_StatusAborted);
}
} else {
- TransactionStatus * status = transaction->getTransactionStatus();
+ TransactionStatus *status = transaction->getTransactionStatus();
if (foundAbort) {
status->setStatus(TransactionStatus_StatusAborted);
} else {
}
Array<char> *Table::acceptDataFromLocal(Array<char> *data) {
-
// Decode the data
ByteBuffer *bbDecode = ByteBuffer_wrap(data);
int64_t lastArbitratedSequenceNumberSeen = bbDecode->getLong();
// Transaction was sent to the server so keep track of it to prevent double commit
if (transaction->getSequenceNumber() != -1) {
- offlineTransactionsCommittedAndAtServer->add(transaction->getId());
+ offlineTransactionsCommittedAndAtServer->add(new Pair<int64_t, int64_t>(transaction->getId()));
}
}
Vector<Entry *> *unseenArbitrations = new Vector<Entry *>();
// Get the aborts to send back
- Vector<int64_t> *abortLocalSequenceNumbers = new Vector<int64_t>(liveAbortsGeneratedByLocal->keySet());
- Collections->sort(abortLocalSequenceNumbers);
+ Vector<int64_t> *abortLocalSequenceNumbers = new Vector<int64_t>();
+ {
+ SetIterator<int64_t, Abort *> *abortit = getKeyIterator(liveAbortsGeneratedByLocal);
+ while (abortit->hasNext())
+ abortLocalSequenceNumbers->add(abortit->next());
+ delete abortit;
+ }
+
+ qsort(abortLocalSequenceNumbers->expose(), abortLocalSequenceNumbers->size(), sizeof(int64_t), compareInt64);
+
uint asize = abortLocalSequenceNumbers->size();
- for(uint i=0; i<asize; i++) {
+ for (uint i = 0; i < asize; i++) {
int64_t localSequenceNumber = abortLocalSequenceNumbers->get(i);
if (localSequenceNumber <= lastArbitratedSequenceNumberSeen) {
continue;
}
-
+
Abort *abort = liveAbortsGeneratedByLocal->get(localSequenceNumber);
unseenArbitrations->add(abort);
returnDataSize += abort->getSize();
// Get the commits to send back
Hashtable<int64_t, Commit *> *commitForClientTable = liveCommitsTable->get(localMachineId);
if (commitForClientTable != NULL) {
- Vector<int64_t> *commitLocalSequenceNumbers = new Vector<int64_t>(commitForClientTable->keySet());
- Collections->sort(commitLocalSequenceNumbers);
+ Vector<int64_t> *commitLocalSequenceNumbers = new Vector<int64_t>();
+ {
+ SetIterator<int64_t, Commit *> *commitit = getKeyIterator(commitForClientTable);
+ while (commitit->hasNext())
+ commitLocalSequenceNumbers->add(commitit->next());
+ delete commitit;
+ }
+ qsort(commitLocalSequenceNumbers->expose(), commitLocalSequenceNumbers->size(), sizeof(int64_t), compareInt64);
uint clsSize = commitLocalSequenceNumbers->size();
- for(uint clsi = 0; clsi < clsSize; clsi++) {
+ for (uint clsi = 0; clsi < clsSize; clsi++) {
int64_t localSequenceNumber = commitLocalSequenceNumbers->get(clsi);
Commit *commit = commitForClientTable->get(localSequenceNumber);
continue;
}
- unseenArbitrations->addAll(commit->getParts()->values());
-
- for (CommitPart *commitPart : commit->getParts()->values()) {
- returnDataSize += commitPart->getSize();
+ {
+ Vector<CommitPart *> *parts = commit->getParts();
+ uint nParts = parts->size();
+ for (uint i = 0; i < nParts; i++) {
+ CommitPart *commitPart = parts->get(i);
+ unseenArbitrations->add(commitPart);
+ returnDataSize += commitPart->getSize();
+ }
}
}
}
// Process each entry in the slot
Vector<Entry *> *entries = s->getEntries();
uint eSize = entries->size();
- for(uint ei=0; ei < eSize; ei++) {
- Entry * entry = entries->get(ei);
+ for (uint ei = 0; ei < eSize; ei++) {
+ Entry *entry = entries->get(ei);
if (entry->getType() == TypeLastMessage) {
LastMessage *lastMessage = (LastMessage *)entry;
* there is already a sufficient entry in the queue (e->g->,
* equalsto value of true and same sequence number)-> */
- int64_t old_seqn = rejectedSlotVector->firstElement();
+ int64_t old_seqn = rejectedSlotVector->get(0);
if (rejectedSlotVector->size() > Table_REJECTED_THRESHOLD) {
int64_t new_seqn = rejectedSlotVector->lastElement();
RejectedMessage *rm = new RejectedMessage(s, s->getSequenceNumber(), localMachineId, old_seqn, new_seqn, false);
// Mandatory Rescue
for (; currentSequenceNumber < threshold; currentSequenceNumber++) {
- Slot * previousSlot = buffer->getSlot(currentSequenceNumber);
+ Slot *previousSlot = buffer->getSlot(currentSequenceNumber);
// Push slot number forward
if (!seenLiveSlot) {
oldestLiveSlotSequenceNumver = currentSequenceNumber;
Vector<Entry *> *liveEntries = previousSlot->getLiveEntries(resize);
// Iterate over all the live entries and try to rescue them
- for (Entry *liveEntry : liveEntries) {
+ uint lESize = liveEntries->size();
+ for (uint i = 0; i < lESize; i++) {
+ Entry *liveEntry = liveEntries->get(i);
if (slot->hasSpace(liveEntry)) {
// Enough space to rescue the entry
slot->addEntry(liveEntry);
* for SKIP_THRESHOLD consecutive entries*/
int skipcount = 0;
int64_t newestseqnum = buffer->getNewestSeqNum();
-search:
for (; seqn <= newestseqnum; seqn++) {
Slot *prevslot = buffer->getSlot(seqn);
//Push slot number forward
continue;
seenliveslot = true;
Vector<Entry *> *liveentries = prevslot->getLiveEntries(resize);
- for (Entry *liveentry : liveentries) {
+ uint lESize = liveentries->size();
+ for (uint i = 0; i < lESize; i++) {
+ Entry *liveentry = liveentries->get(i);
if (s->hasSpace(liveentry))
s->addEntry(liveentry);
else {
}
}
}
- donesearch:
+donesearch:
;
}
checkHMACChain(indexer, newSlots);
// Set to keep track of messages from clients
- Hashset<int64_t> *machineSet = new Hashset<int64_t>(lastMessageTable->keySet());
+ Hashset<int64_t> *machineSet = new Hashset<int64_t>();
+ {
+ SetIterator<int64_t, Pair<int64_t, Liveness *> *> *lmit = getKeyIterator(lastMessageTable);
+ while (lmit->hasNext())
+ machineSet->add(lmit->next());
+ delete lmit;
+ }
// Process each slots data
- for (Slot *slot : newSlots) {
- processSlot(indexer, slot, acceptUpdatesToLocal, machineSet);
-
- updateExpectedSize();
+ {
+ uint numSlots = newSlots->length();
+ for (uint i = 0; i < numSlots; i++) {
+ Slot *slot = newSlots->get(i);
+ processSlot(indexer, slot, acceptUpdatesToLocal, machineSet);
+ updateExpectedSize();
+ }
}
// If there is a gap, check to see if the server sent us
// Check the size of the slots that were sent down by the server->
// Can only check the size if there was a gap
- checkNumSlots(newSlots->length);
+ checkNumSlots(newSlots->length());
// Since there was a gap every machine must have pushed a slot or
// must have a last message message-> If not then the server is
commitNewMaxSize();
// Commit new to slots to the local block chain->
- for (Slot *slot : newSlots) {
+ {
+ uint numSlots = newSlots->length();
+ for (uint i = 0; i < numSlots; i++) {
+ Slot *slot = newSlots->get(i);
- // Insert this slot into our local block chain copy->
- buffer->putSlot(slot);
+ // Insert this slot into our local block chain copy->
+ buffer->putSlot(slot);
- // Keep track of how many slots are currently live (have live data
- // in them)->
- liveSlotCount++;
+ // Keep track of how many slots are currently live (have live data
+ // in them)->
+ liveSlotCount++;
+ }
}
-
// Get the sequence number of the latest slot in the system
sequenceNumber = newSlots->get(newSlots->length() - 1)->getSequenceNumber();
updateLiveStateFromServer();
}
}
-void Table::updateCurrMaxSize(int newmaxsize) {
- currMaxSize = newmaxsize;
-}
-
-
/**
* Update the size of of the local buffer if it is needed->
*/
// Iterate through all the machine Ids that we received new parts
// for
- for (int64_t machineId : newTransactionParts->keySet()) {
+ SetIterator<int64_t, Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *> *tpit = getKeyIterator(newTransactionParts);
+ while (tpit->hasNext()) {
+ int64_t machineId = tpit->next();
Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *parts = newTransactionParts->get(machineId);
+ SetIterator<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *ptit = getKeyIterator(parts);
// Iterate through all the parts for that machine Id
- for (Pair<int64_t, int32_t> partId : parts->keySet()) {
+ while (ptit->hasNext()) {
+ Pair<int64_t, int32_t> *partId = ptit->next();
TransactionPart *part = parts->get(partId);
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(part->getArbitratorId());
- if ((lastTransactionNumber != NULL) && (lastTransactionNumber >= part->getSequenceNumber())) {
- // Set dead the transaction part
- part->setDead();
- continue;
+ if (lastArbitratedTransactionNumberByArbitratorTable->contains(part->getArbitratorId())) {
+ int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(part->getArbitratorId());
+ if (lastTransactionNumber >= part->getSequenceNumber()) {
+ // Set dead the transaction part
+ part->setDead();
+ continue;
+ }
}
// Get the transaction object for that sequence number
// Insert this new transaction into the live tables
liveTransactionBySequenceNumberTable->put(part->getSequenceNumber(), transaction);
- liveTransactionByTransactionIdTable->put(part->getTransactionId(), transaction);
+ liveTransactionByTransactionIdTable->put(new Pair<int64_t, int64_t>(part->getTransactionId()), transaction);
}
// Add that part to the transaction
transaction->addPartDecode(part);
}
+ delete ptit;
}
-
+ delete tpit;
// Clear all the new transaction parts in preparation for the next
// time the server sends slots
newTransactionParts->clear();
}
// Get the transaction sequence numbers and sort from oldest to newest
- Vector<int64_t> *transactionSequenceNumbers = new Vector<int64_t>(liveTransactionBySequenceNumberTable->keySet());
- Collections->sort(transactionSequenceNumbers);
+ Vector<int64_t> *transactionSequenceNumbers = new Vector<int64_t>();
+ {
+ SetIterator<int64_t, Transaction *> *trit = getKeyIterator(liveTransactionBySequenceNumberTable);
+ while (trit->hasNext())
+ transactionSequenceNumbers->add(trit->next());
+ delete trit;
+ }
+ qsort(transactionSequenceNumbers->expose(), transactionSequenceNumbers->size(), sizeof(int64_t), compareInt64);
// Collection of key value pairs that are
- Hashtable<IoTString *, KeyValue *> * speculativeTableTmp = new Hashtable<IoTString *, KeyValue *>();
+ Hashtable<IoTString *, KeyValue *> *speculativeTableTmp = new Hashtable<IoTString *, KeyValue *>();
// The last transaction arbitrated on
int64_t lastTransactionCommitted = -1;
Hashset<Abort *> *generatedAborts = new Hashset<Abort *>();
-
- for (int64_t transactionSequenceNumber : transactionSequenceNumbers) {
+ uint tsnSize = transactionSequenceNumbers->size();
+ for (uint i = 0; i < tsnSize; i++) {
+ int64_t transactionSequenceNumber = transactionSequenceNumbers->get(i);
Transaction *transaction = liveTransactionBySequenceNumberTable->get(transactionSequenceNumber);
-
-
// Check if this machine arbitrates for this transaction if not
// then we cant arbitrate this transaction
if (transaction->getArbitrator() != localMachineId) {
// update the largest transaction seen by arbitrator from server
- if (lastTransactionSeenFromMachineFromServer->get(transaction->getMachineId()) == NULL) {
+ if (!lastTransactionSeenFromMachineFromServer->contains(transaction->getMachineId())) {
lastTransactionSeenFromMachineFromServer->put(transaction->getMachineId(), transaction->getClientLocalSequenceNumber());
} else {
int64_t lastTransactionSeenFromMachine = lastTransactionSeenFromMachineFromServer->get(transaction->getMachineId());
// Guard evaluated as true
// Update the local changes so we can make the commit
- SetIterator<KeyValue *> *kvit = getKeyIterator(transaction->getKeyValueUpdateSet());
+ SetIterator<KeyValue *, KeyValue *> *kvit = transaction->getKeyValueUpdateSet()->iterator();
while (kvit->hasNext()) {
KeyValue *kv = kvit->next();
speculativeTableTmp->put(kv->getKey(), kv);
}
delete kvit;
-
+
// Update what the last transaction committed was for use in batch commit
lastTransactionCommitted = transactionSequenceNumber;
} else {
localArbitrationSequenceNumber++;
// Add all the new keys to the commit
- for (KeyValue *kv : speculativeTableTmp->values()) {
+ SetIterator<IoTString *, KeyValue *> *spit = getKeyIterator(speculativeTableTmp);
+ while (spit->hasNext()) {
+ IoTString *string = spit->next();
+ KeyValue *kv = speculativeTableTmp->get(string);
newCommit->addKV(kv);
}
+ delete spit;
// create the commit parts
newCommit->createCommitParts();
// Append all the commit parts to the end of the pending queue
// waiting for sending to the server
// Insert the commit so we can process it
- for (CommitPart *commitPart : newCommit->getParts()->values()) {
+ Vector<CommitPart *> *parts = newCommit->getParts();
+ uint partsSize = parts->size();
+ for (uint i = 0; i < partsSize; i++) {
+ CommitPart *commitPart = parts->get(i);
processEntry(commitPart);
}
}
if (compactArbitrationData()) {
ArbitrationRound *newArbitrationRound = pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size() - 1);
if (newArbitrationRound->getCommit() != NULL) {
- for (CommitPart *commitPart : newArbitrationRound->getCommit()->getParts()->values()) {
+ Vector<CommitPart *> *parts = newArbitrationRound->getCommit()->getParts();
+ uint partsSize = parts->size();
+ for (uint i = 0; i < partsSize; i++) {
+ CommitPart *commitPart = parts->get(i);
processEntry(commitPart);
}
}
if (transaction->getMachineId() != localMachineId) {
// dont do this check for local transactions
- if (lastTransactionSeenFromMachineFromServer->get(transaction->getMachineId()) != NULL) {
+ if (lastTransactionSeenFromMachineFromServer->contains(transaction->getMachineId())) {
if (lastTransactionSeenFromMachineFromServer->get(transaction->getMachineId()) > transaction->getClientLocalSequenceNumber()) {
// We've have already seen this from the server
return Pair<bool, bool>(false, false);
localArbitrationSequenceNumber++;
// Update the local changes so we can make the commit
- SetIterator<KeyValue *> *kvit = getKeyIterator(transaction->getKeyValueUpdateSet());
+ SetIterator<KeyValue *, KeyValue *> *kvit = transaction->getKeyValueUpdateSet()->iterator();
while (kvit->hasNext()) {
KeyValue *kv = kvit->next();
newCommit->addKV(kv);
}
delete kvit;
-
+
// create the commit parts
newCommit->createCommitParts();
if (compactArbitrationData()) {
ArbitrationRound *newArbitrationRound = pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size() - 1);
- for (CommitPart *commitPart : newArbitrationRound->getCommit()->getParts()->values()) {
+ Vector<CommitPart *> *parts = newArbitrationRound->getCommit()->getParts();
+ uint partsSize = parts->size();
+ for (uint i = 0; i < partsSize; i++) {
+ CommitPart *commitPart = parts->get(i);
processEntry(commitPart);
}
} else {
// Insert the commit so we can process it
- for (CommitPart *commitPart : newCommit->getParts()->values()) {
+ Vector<CommitPart *> *parts = newCommit->getParts();
+ uint partsSize = parts->size();
+ for (uint i = 0; i < partsSize; i++) {
+ CommitPart *commitPart = parts->get(i);
processEntry(commitPart);
}
}
if (transaction->getMachineId() == localMachineId) {
// For locally created messages update the status
// Guard evaluated was false so create abort
- TransactionStatus * status = transaction->getTransactionStatus();
+ TransactionStatus *status = transaction->getTransactionStatus();
if (status != NULL) {
status->setStatus(TransactionStatus_StatusAborted);
}
if (compactArbitrationData()) {
ArbitrationRound *newArbitrationRound = pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size() - 1);
- for (CommitPart *commitPart : newArbitrationRound->getCommit()->getParts()->values()) {
+
+ Vector<CommitPart *> *parts = newArbitrationRound->getCommit()->getParts();
+ uint partsSize = parts->size();
+ for (uint i = 0; i < partsSize; i++) {
+ CommitPart *commitPart = parts->get(i);
processEntry(commitPart);
}
}
int numberToDelete = 1;
while (numberToDelete < pendingSendArbitrationRounds->size()) {
- ArbitrationRound *xs round = pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size() - numberToDelete - 1);
+ ArbitrationRound *round = pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size() - numberToDelete - 1);
if (round->isFull() || round->getDidSendPart()) {
// Stop since there is a part that cannot be compacted and we
if (round->getCommit() == NULL) {
// Try compacting aborts only
int newSize = round->getCurrentSize() + lastRound->getAbortsCount();
- if (newSize > ArbitrationRound->MAX_PARTS) {
+ if (newSize > ArbitrationRound_MAX_PARTS) {
// Cant compact since it would be too large
break;
}
lastRound->addAborts(round->getAborts());
} else {
// Create a new larger commit
- Commit newCommit = Commit->merge(lastRound->getCommit(), round->getCommit(), localArbitrationSequenceNumber);
+ Commit *newCommit = Commit_merge(lastRound->getCommit(), round->getCommit(), localArbitrationSequenceNumber);
localArbitrationSequenceNumber++;
// Create the commit parts so that we can count them
newSize += lastRound->getAbortsCount();
newSize += round->getAbortsCount();
- if (newSize > ArbitrationRound->MAX_PARTS) {
+ if (newSize > ArbitrationRound_MAX_PARTS) {
// Cant compact since it would be too large
break;
}
pendingSendArbitrationRounds->clear();
} else {
for (int i = 0; i < numberToDelete; i++) {
- pendingSendArbitrationRounds->remove(pendingSendArbitrationRounds->size() - 1);
+ pendingSendArbitrationRounds->removeIndex(pendingSendArbitrationRounds->size() - 1);
}
}
}
// Iterate through all the machine Ids that we received new parts for
- for (int64_t machineId : newCommitParts->keySet()) {
- Hashtable<Pair<int64_t, int32_t> *, CommitPart *> *parts = newCommitParts->get(machineId);
+ SetIterator<int64_t, Hashtable<Pair<int64_t, int32_t> *, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals> *> *partsit = getKeyIterator(newCommitParts);
+ while (partsit->hasNext()) {
+ int64_t machineId = partsit->next();
+ Hashtable<Pair<int64_t, int32_t> *, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals> *parts = newCommitParts->get(machineId);
// Iterate through all the parts for that machine Id
- for (Pair<int64_t, int32_t> partId : parts->keySet()) {
+ SetIterator<Pair<int64_t, int32_t> *, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals> *pairit = getKeyIterator(parts);
+ while (pairit->hasNext()) {
+ Pair<int64_t, int32_t> *partId = pairit->next();
CommitPart *part = parts->get(partId);
// Get the transaction object for that sequence number
// Add that part to the commit
commit->addPartDecode(part);
}
+ delete pairit;
}
+ delete partsit;
// Clear all the new commits parts in preparation for the next time
// the server sends slots
bool didProcessANewCommit = false;
// Process the commits one by one
- for (int64_T arbitratorId : liveCommitsTable->keySet()) {
+ SetIterator<int64_t, Hashtable<int64_t, Commit *> *> *liveit = getKeyIterator(liveCommitsTable);
+ while (liveit->hasNext()) {
+ int64_t arbitratorId = liveit->next();
// Get all the commits for a specific arbitrator
Hashtable<int64_t, Commit *> *commitForClientTable = liveCommitsTable->get(arbitratorId);
// Sort the commits in order
- Vector<int64_t> *commitSequenceNumbers = new Vector<int64_t>(commitForClientTable->keySet());
- Collections->sort(commitSequenceNumbers);
+ Vector<int64_t> *commitSequenceNumbers = new Vector<int64_t>();
+ {
+ SetIterator<int64_t, Commit *> *clientit = getKeyIterator(commitForClientTable);
+ while (clientit->hasNext())
+ commitSequenceNumbers->add(clientit->next());
+ delete clientit;
+ }
+
+ qsort(commitSequenceNumbers->expose(), commitSequenceNumbers->size(), sizeof(int64_t), compareInt64);
// Get the last commit seen from this arbitrator
int64_t lastCommitSeenSequenceNumber = -1;
- if (lastCommitSeenSequenceNumberByArbitratorTable->get(arbitratorId) != NULL) {
+ if (lastCommitSeenSequenceNumberByArbitratorTable->contains(arbitratorId)) {
lastCommitSeenSequenceNumber = lastCommitSeenSequenceNumberByArbitratorTable->get(arbitratorId);
}
// Update the last transaction that was updated if we can
if (commit->getTransactionSequenceNumber() != -1) {
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(commit->getMachineId());
-
- // Update the last transaction sequence number that the arbitrator arbitrated on
- if ((lastTransactionNumber == NULL) || (lastTransactionNumber < commit->getTransactionSequenceNumber())) {
+ // Update the last transaction sequence number that the arbitrator arbitrated on1
+ if (!lastArbitratedTransactionNumberByArbitratorTable->contains(commit->getMachineId()) || lastArbitratedTransactionNumberByArbitratorTable->get(commit->getMachineId()) < commit->getTransactionSequenceNumber()) {
lastArbitratedTransactionNumberByArbitratorTable->put(commit->getMachineId(), commit->getTransactionSequenceNumber());
}
}
// Update the last transaction that was updated if we can
if (commit->getTransactionSequenceNumber() != -1) {
int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(commit->getMachineId());
-
- // Update the last transaction sequence number that the arbitrator arbitrated on
- if ((lastTransactionNumber == NULL) || (lastTransactionNumber < commit->getTransactionSequenceNumber())) {
+ if (!lastArbitratedTransactionNumberByArbitratorTable->contains(commit->getMachineId()) ||
+ lastArbitratedTransactionNumberByArbitratorTable->get(commit->getMachineId()) < commit->getTransactionSequenceNumber()) {
lastArbitratedTransactionNumberByArbitratorTable->put(commit->getMachineId(), commit->getTransactionSequenceNumber());
}
}
// Get what commits should be edited, these are the commits that
// have live values for their keys
Hashset<Commit *> *commitsToEdit = new Hashset<Commit *>();
- SetIterator<KeyValue *> *kvit = getKeyIterator(commit->getKeyValueUpdateSet());
- while (kvit->hasNext()) {
- KeyValue *kv = kvit->next();
- commitsToEdit->add(liveCommitsByKeyTable->get(kv->getKey()));
+ {
+ SetIterator<KeyValue *, KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = commit->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
+ Commit *commit = liveCommitsByKeyTable->get(kv->getKey());
+ if (commit != NULL)
+ commitsToEdit->add(commit);
+ }
+ delete kvit;
}
- delete kvit;
- commitsToEdit->remove(NULL); // remove NULL since it could be in this set
// Update each previous commit that needs to be updated
- for (Commit *previousCommit : commitsToEdit) {
+ SetIterator<Commit *, Commit *> *commitit = commitsToEdit->iterator();
+ while (commitit->hasNext()) {
+ Commit *previousCommit = commitit->next();
// Only bother with live commits (TODO: Maybe remove this check)
if (previousCommit->isLive()) {
// Update which keys in the old commits are still live
- SetIterator<KeyValue *> *kvit = getKeyIterator(commit->getKeyValueUpdateSet());
- while (kvit->hasNext()) {
- KeyValue *kv = kvit->next();
- previousCommit->invalidateKey(kv->getKey());
+ {
+ SetIterator<KeyValue *, KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = commit->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
+ previousCommit->invalidateKey(kv->getKey());
+ }
+ delete kvit;
}
- delete kvit;
-
+
// if the commit is now dead then remove it
if (!previousCommit->isLive()) {
- commitForClientTable->remove(previousCommit);
+ commitForClientTable->remove(previousCommit->getSequenceNumber());
}
}
}
+ delete commitit;
// Update the last seen sequence number from this arbitrator
- if (lastCommitSeenSequenceNumberByArbitratorTable->get(commit->getMachineId()) != NULL) {
+ if (lastCommitSeenSequenceNumberByArbitratorTable->contains(commit->getMachineId())) {
if (commit->getSequenceNumber() > lastCommitSeenSequenceNumberByArbitratorTable->get(commit->getMachineId())) {
lastCommitSeenSequenceNumberByArbitratorTable->put(commit->getMachineId(), commit->getSequenceNumber());
}
didProcessANewCommit = true;
// Update the committed table of keys and which commit is using which key
- SetIterator<KeyValue *> *kvit = getKeyIterator(commit->getKeyValueUpdateSet());
- while (kvit->hasNext()) {
- KeyValue *kv = kvit->next();
- committedKeyValueTable->put(kv->getKey(), kv);
- liveCommitsByKeyTable->put(kv->getKey(), commit);
+ {
+ SetIterator<KeyValue *, KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = commit->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
+ committedKeyValueTable->put(kv->getKey(), kv);
+ liveCommitsByKeyTable->put(kv->getKey(), commit);
+ }
+ delete kvit;
}
- delete kvit;
}
}
+ delete liveit;
return didProcessANewCommit;
}
* and have come from the cloud
*/
bool Table::updateSpeculativeTable(bool didProcessNewCommits) {
- if (liveTransactionBySequenceNumberTable->keySet()->size() == 0) {
+ if (liveTransactionBySequenceNumberTable->size() == 0) {
// There is nothing to speculate on
return false;
}
// Create a list of the transaction sequence numbers and sort them
// from oldest to newest
- Vector<int64_t> *transactionSequenceNumbersSorted = new Vector<int64_t>(liveTransactionBySequenceNumberTable->keySet());
- Collections->sort(transactionSequenceNumbersSorted);
+ Vector<int64_t> *transactionSequenceNumbersSorted = new Vector<int64_t>();
+ {
+ SetIterator<int64_t, Transaction *> *trit = getKeyIterator(liveTransactionBySequenceNumberTable);
+ while (trit->hasNext())
+ transactionSequenceNumbersSorted->add(trit->next());
+ delete trit;
+ }
+
+ qsort(transactionSequenceNumbersSorted->expose(), transactionSequenceNumbersSorted->size(), sizeof(int64_t), compareInt64);
bool hasGapInTransactionSequenceNumbers = transactionSequenceNumbersSorted->get(0) != oldestTransactionSequenceNumberSpeculatedOn;
speculatedKeyValueTable->clear();
lastTransactionSequenceNumberSpeculatedOn = -1;
oldestTransactionSequenceNumberSpeculatedOn = -1;
-
}
// Remember the front of the transaction list
oldestTransactionSequenceNumberSpeculatedOn = transactionSequenceNumbersSorted->get(0);
// Find where to start arbitration from
- int startIndex = transactionSequenceNumbersSorted->indexOf(lastTransactionSequenceNumberSpeculatedOn) + 1;
+ int startIndex = 0;
+
+ for (; startIndex < transactionSequenceNumbersSorted->size(); startIndex++)
+ if (transactionSequenceNumbersSorted->get(startIndex) == lastTransactionSequenceNumberSpeculatedOn)
+ break;
+ startIndex++;
if (startIndex >= transactionSequenceNumbersSorted->size()) {
// Make sure we are not out of bounds
if (transaction->evaluateGuard(committedKeyValueTable, speculatedKeyValueTable, NULL)) {
// Guard evaluated to true so update the speculative table
- SetIterator<KeyValue *> *kvit = getKeyIterator(commit->getKeyValueUpdateSet());
- while (kvit->hasNext()) {
- KeyValue *kv = kvit->next();
- speculatedKeyValueTable->put(kv->getKey(), kv);
+ {
+ SetIterator<KeyValue *, KeyValue *> *kvit = transaction->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
+ speculatedKeyValueTable->put(kv->getKey(), kv);
+ }
+ delete kvit;
}
- delete kvit;
}
}
}
// Find where to start arbitration from
- int startIndex = pendingTransactionQueue->indexOf(firstPendingTransaction) + 1;
+ int startIndex = 0;
+
+ for (; startIndex < pendingTransactionQueue->size(); startIndex++)
+ if (pendingTransactionQueue->get(startIndex) == firstPendingTransaction)
+ break;
if (startIndex >= pendingTransactionQueue->size()) {
// Make sure we are not out of bounds
if (transaction->evaluateGuard(committedKeyValueTable, speculatedKeyValueTable, pendingTransactionSpeculatedKeyValueTable)) {
// Guard evaluated to true so update the speculative table
- SetIterator<KeyValue *> *kvit = getKeyIterator(commit->getKeyValueUpdateSet());
+ SetIterator<KeyValue *, KeyValue *> *kvit = transaction->getKeyValueUpdateSet()->iterator();
while (kvit->hasNext()) {
KeyValue *kv = kvit->next();
pendingTransactionSpeculatedKeyValueTable->put(kv->getKey(), kv);
* transactions that are dead
*/
void Table::updateLiveTransactionsAndStatus() {
-
// Go through each of the transactions
- for (Iterator<Map->Entry<int64_t, Transaction> > *iter = liveTransactionBySequenceNumberTable->entrySet()->iterator(); iter->hasNext();) {
- Transaction *transaction = iter->next()->getValue();
-
- // Check if the transaction is dead
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(transaction->getArbitrator());
- if ((lastTransactionNumber != NULL) && (lastTransactionNumber >= transaction->getSequenceNumber())) {
-
- // Set dead the transaction
- transaction->setDead();
-
- // Remove the transaction from the live table
- iter->remove();
- liveTransactionByTransactionIdTable->remove(transaction->getId());
+ {
+ SetIterator<int64_t, Transaction *> *iter = getKeyIterator(liveTransactionBySequenceNumberTable);
+ while (iter->hasNext()) {
+ int64_t key = iter->next();
+ Transaction *transaction = liveTransactionBySequenceNumberTable->get(key);
+
+ // Check if the transaction is dead
+ if (lastArbitratedTransactionNumberByArbitratorTable->contains(transaction->getArbitrator()) && lastArbitratedTransactionNumberByArbitratorTable->get(transaction->getArbitrator() >= transaction->getSequenceNumber())) {
+ // Set dead the transaction
+ transaction->setDead();
+
+ // Remove the transaction from the live table
+ iter->remove();
+ liveTransactionByTransactionIdTable->remove(transaction->getId());
+ }
}
+ delete iter;
}
// Go through each of the transactions
- for (Iterator<Map->Entry<int64_t, TransactionStatus *> > *iter = outstandingTransactionStatus->entrySet()->iterator(); iter->hasNext();) {
- TransactionStatus *status = iter->next()->getValue();
+ {
+ SetIterator<int64_t, TransactionStatus *> *iter = getKeyIterator(outstandingTransactionStatus);
+ while (iter->hasNext()) {
+ int64_t key = iter->next();
+ TransactionStatus *status = outstandingTransactionStatus->get(key);
- // Check if the transaction is dead
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(status->getTransactionArbitrator());
- if ((lastTransactionNumber != NULL) && (lastTransactionNumber >= status->getTransactionSequenceNumber())) {
+ // Check if the transaction is dead
+ if (lastArbitratedTransactionNumberByArbitratorTable->contains(status->getTransactionArbitrator()) && (lastArbitratedTransactionNumberByArbitratorTable->get(status->getTransactionArbitrator()) >= status->getTransactionSequenceNumber())) {
- // Set committed
- status->setStatus(TransactionStatus_StatusCommitted);
+ // Set committed
+ status->setStatus(TransactionStatus_StatusCommitted);
- // Remove
- iter->remove();
+ // Remove
+ iter->remove();
+ }
}
+ delete iter;
}
}
// Process each entry in the slot
Vector<Entry *> *entries = slot->getEntries();
uint eSize = entries->size();
- for(uint ei=0; ei < eSize; ei++) {
- Entry * entry = entries->get(ei);
+ for (uint ei = 0; ei < eSize; ei++) {
+ Entry *entry = entries->get(ei);
switch (entry->getType()) {
case TypeCommitPart:
processEntry((CommitPart *)entry);
* seen in this current round of updating the local copy of the block
* chain
*/
-void Table::processEntry(TableStatus entry, int64_t seq) {
+void Table::processEntry(TableStatus *entry, int64_t seq) {
int newNumSlots = entry->getMaxSlots();
updateCurrMaxSize(newNumSlots);
initExpectedSize(seq, newNumSlots);
// Create a list of clients to watch until they see this rejected
// message entry->
Hashset<int64_t> *deviceWatchSet = new Hashset<int64_t>();
- for (Map->Entry<int64_t, Pair<int64_t, Liveness *> > *lastMessageEntry : lastMessageTable->entrySet()) {
+ SetIterator<int64_t, Pair<int64_t, Liveness *> *> *iter = getKeyIterator(lastMessageTable);
+ while (iter->hasNext()) {
// Machine ID for the last message entry
- int64_t lastMessageEntryMachineId = lastMessageEntry->getKey();
+ int64_t lastMessageEntryMachineId = iter->next();
// We've seen it, don't need to continue to watch-> Our next
// message will implicitly acknowledge it->
continue;
}
- Pair<int64_t, Liveness *> lastMessageValue = lastMessageEntry->getValue();
- int64_t entrySequenceNumber = lastMessageValue.getFirst();
+ Pair<int64_t, Liveness *> *lastMessageValue = lastMessageTable->get(lastMessageEntryMachineId);
+ int64_t entrySequenceNumber = lastMessageValue->getFirst();
if (entrySequenceNumber < seq) {
// Add this rejected message to the set of messages that this
deviceWatchSet->add(lastMessageEntryMachineId);
}
}
+ delete iter;
+
if (deviceWatchSet->isEmpty()) {
// This rejected message has been seen by all the clients so
entry->setDead();
// Abort has not been seen by the client it is for yet so we need to
// keep track of it
- Abort *previouslySeenAbort = liveAbortTable->put(entry->getAbortId(), entry);
+
+ Abort *previouslySeenAbort = liveAbortTable->put(new Pair<int64_t, int64_t>(entry->getAbortId()), entry);
if (previouslySeenAbort != NULL) {
previouslySeenAbort->setDead(); // Delete old version of the abort since we got a rescued newer version
}
liveAbortsGeneratedByLocal->put(entry->getArbitratorLocalSequenceNumber(), entry);
}
- if ((entry->getSequenceNumber() != -1) && (lastMessageTable->get(entry->getTransactionMachineId()).getFirst() >= entry->getSequenceNumber())) {
+ if ((entry->getSequenceNumber() != -1) && (lastMessageTable->get(entry->getTransactionMachineId())->getFirst() >= entry->getSequenceNumber())) {
// The machine already saw this so it is dead
entry->setDead();
- liveAbortTable->remove(entry->getAbortId());
+ Pair<int64_t, int64_t> abortid = entry->getAbortId();
+ liveAbortTable->remove(&abortid);
if (entry->getTransactionArbitrator() == localMachineId) {
liveAbortsGeneratedByLocal->remove(entry->getArbitratorLocalSequenceNumber());
}
// Update the last arbitration data that we have seen so far
- if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(entry->getTransactionArbitrator()) != NULL) {
+ if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->contains(entry->getTransactionArbitrator())) {
int64_t lastArbitrationSequenceNumber = lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(entry->getTransactionArbitrator());
if (entry->getSequenceNumber() > lastArbitrationSequenceNumber) {
// Is larger
}
// Set dead a transaction if we can
- Transaction *transactionToSetDead = liveTransactionByTransactionIdTable->remove(Pair<int64_t, int64_t>(entry->getTransactionMachineId(), entry->getTransactionClientLocalSequenceNumber()));
+ Pair<int64_t, int64_t> deadPair = Pair<int64_t, int64_t>(entry->getTransactionMachineId(), entry->getTransactionClientLocalSequenceNumber());
+
+ Transaction *transactionToSetDead = liveTransactionByTransactionIdTable->remove(&deadPair);
if (transactionToSetDead != NULL) {
liveTransactionBySequenceNumberTable->remove(transactionToSetDead->getSequenceNumber());
}
// Update the last transaction sequence number that the arbitrator
// arbitrated on
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(entry->getTransactionArbitrator());
- if ((lastTransactionNumber == NULL) || (lastTransactionNumber < entry->getTransactionSequenceNumber())) {
+ if (!lastArbitratedTransactionNumberByArbitratorTable->contains(entry->getTransactionArbitrator()) ||
+ (lastArbitratedTransactionNumberByArbitratorTable->get(entry->getTransactionArbitrator()) < entry->getTransactionSequenceNumber())) {
// Is a valid one
if (entry->getTransactionSequenceNumber() != -1) {
lastArbitratedTransactionNumberByArbitratorTable->put(entry->getTransactionArbitrator(), entry->getTransactionSequenceNumber());
void Table::processEntry(TransactionPart *entry) {
// Check if we have already seen this transaction and set it dead OR
// if it is not alive
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(entry->getArbitratorId());
- if ((lastTransactionNumber != NULL) && (lastTransactionNumber >= entry->getSequenceNumber())) {
+ if (lastArbitratedTransactionNumberByArbitratorTable->contains(entry->getArbitratorId()) && (lastArbitratedTransactionNumberByArbitratorTable->get(entry->getArbitratorId()) >= entry->getSequenceNumber())) {
// This transaction is dead, it was already committed or aborted
entry->setDead();
return;
// Update the part and set dead ones we have already seen (got a
// rescued version)
- TransactionPart *previouslySeenPart = transactionPart->put(entry->getPartId(), entry);
+ TransactionPart *previouslySeenPart = transactionPart->put(new Pair<int64_t, int32_t>(entry->getPartId()), entry);
if (previouslySeenPart != NULL) {
previouslySeenPart->setDead();
}
void Table::processEntry(CommitPart *entry) {
// Update the last transaction that was updated if we can
if (entry->getTransactionSequenceNumber() != -1) {
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(entry->getMachineId());
- // Update the last transaction sequence number that the arbitrator
- // arbitrated on
- if ((lastTransactionNumber == NULL) || (lastTransactionNumber < entry->getTransactionSequenceNumber())) {
+ if (!lastArbitratedTransactionNumberByArbitratorTable->contains(entry->getMachineId() || lastArbitratedTransactionNumberByArbitratorTable->get(entry->getMachineId()) < entry->getTransactionSequenceNumber())) {
lastArbitratedTransactionNumberByArbitratorTable->put(entry->getMachineId(), entry->getTransactionSequenceNumber());
}
}
- Hashtable<Pair<int64_t, int32_t> *, CommitPart *> *commitPart = newCommitParts->get(entry->getMachineId());
+ Hashtable<Pair<int64_t, int32_t> *, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals> *commitPart = newCommitParts->get(entry->getMachineId());
if (commitPart == NULL) {
// Don't have a table for this machine Id yet so make one
- commitPart = new Hashtable<Pair<int64_t, int32_t> *, CommitPart *>();
+ commitPart = new Hashtable<Pair<int64_t, int32_t> *, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals>();
newCommitParts->put(entry->getMachineId(), commitPart);
}
// Update the part and set dead ones we have already seen (got a
// rescued version)
- CommitPart *previouslySeenPart = commitPart->put(entry->getPartId(), entry);
+ CommitPart *previouslySeenPart = commitPart->put(new Pair<int64_t, int32_t>(entry->getPartId()), entry);
if (previouslySeenPart != NULL) {
previouslySeenPart->setDead();
}
* our own last message or that other clients have not had a rollback
* on the last message->
*/
-void Table::updateLastMessage(int64_t machineId, int64_t seqNum, Liveness *liveness, bool acceptUpdatesToLocal, Hashset<intr64_t> *machineSet) {
+void Table::updateLastMessage(int64_t machineId, int64_t seqNum, Liveness *liveness, bool acceptUpdatesToLocal, Hashset<int64_t> *machineSet) {
// We have seen this machine ID
machineSet->remove(machineId);
if (watchset != NULL) {
// Go through each rejected message that this machine Id has not
// seen yet
- for (Iterator<RejectedMessage *> *rmit = watchset->iterator(); rmit->hasNext(); ) {
+
+ SetIterator<RejectedMessage *, RejectedMessage *> *rmit = watchset->iterator();
+ while (rmit->hasNext()) {
RejectedMessage *rm = rmit->next();
// If this machine Id has seen this rejected message->->->
if (rm->getSequenceNumber() <= seqNum) {
rm->removeWatcher(machineId);
}
}
+ delete rmit;
}
// Set dead the abort
- for (Iterator<Map->Entry<Pair<int64_t, int64_t>, Abort *> > i = liveAbortTable->entrySet()->iterator(); i->hasNext();) {
- Abort *abort = i->next()->getValue();
+ SetIterator<Pair<int64_t, int64_t> *, Abort *, uintptr_t, 0, pairHashFunction, pairEquals> *abortit = getKeyIterator(liveAbortTable);
+
+ while (abortit->hasNext()) {
+ Pair<int64_t, int64_t> *key = abortit->next();
+ Abort *abort = liveAbortTable->get(key);
if ((abort->getTransactionMachineId() == machineId) && (abort->getSequenceNumber() <= seqNum)) {
abort->setDead();
- i->remove();
+ abortit->remove();
if (abort->getTransactionArbitrator() == localMachineId) {
liveAbortsGeneratedByLocal->remove(abort->getArbitratorLocalSequenceNumber());
}
}
}
+ delete abortit;
if (machineId == localMachineId) {
// Our own messages are immediately dead->
- if (liveness instanceof LastMessage) {
+ char livenessType = liveness->getType();
+ if (livenessType == TypeLastMessage) {
((LastMessage *)liveness)->setDead();
- } else if (liveness instanceof Slot) {
+ } else if (livenessType == TypeSlot) {
((Slot *)liveness)->setDead();
} else {
throw new Error("Unrecognized type");
}
}
// Get the old last message for this device
- Pair<int64_t, Liveness *> lastMessageEntry = lastMessageTable->put(machineId, Pair<int64_t, Liveness *>(seqNum, liveness));
+ Pair<int64_t, Liveness *> *lastMessageEntry = lastMessageTable->put(machineId, new Pair<int64_t, Liveness *>(seqNum, liveness));
if (lastMessageEntry == NULL) {
// If no last message then there is nothing else to process
return;
}
- int64_t lastMessageSeqNum = lastMessageEntry.getFirst();
- Liveness *lastEntry = lastMessageEntry.getSecond();
+ int64_t lastMessageSeqNum = lastMessageEntry->getFirst();
+ Liveness *lastEntry = lastMessageEntry->getSecond();
+ delete lastMessageEntry;
// If it is not our machine Id since we already set ours to dead
if (machineId != localMachineId) {
- if (lastEntry instanceof LastMessage) {
+ char lastEntryType = lastEntry->getType();
+
+ if (lastEntryType == TypeLastMessage) {
((LastMessage *)lastEntry)->setDead();
- } else if (lastEntry instanceof Slot) {
+ } else if (lastEntryType == TypeSlot) {
((Slot *)lastEntry)->setDead();
} else {
throw new Error("Unrecognized type");
projects / iotcloud.git / blobdiff