#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 "ArbitrationRound.h"
+#include "TransactionPart.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),
oldestLiveSlotSequenceNumver(1),
localMachineId(_localMachineId),
sequenceNumber(0),
+ localSequenceNumber(0),
localTransactionSequenceNumber(0),
lastTransactionSequenceNumberSpeculatedOn(0),
oldestTransactionSequenceNumberSpeculatedOn(0),
oldestLiveSlotSequenceNumver(1),
localMachineId(_localMachineId),
sequenceNumber(0),
+ localSequenceNumber(0),
localTransactionSequenceNumber(0),
lastTransactionSequenceNumberSpeculatedOn(0),
oldestTransactionSequenceNumberSpeculatedOn(0),
init();
}
+Table::~Table() {
+ delete cloud;
+ delete random;
+ delete buffer;
+ // init data structs
+ delete committedKeyValueTable;
+ delete speculatedKeyValueTable;
+ delete pendingTransactionSpeculatedKeyValueTable;
+ delete liveNewKeyTable;
+ {
+ SetIterator<int64_t, Pair<int64_t, Liveness *> *> *lmit = getKeyIterator(lastMessageTable);
+ while (lmit->hasNext()) {
+ Pair<int64_t, Liveness *> * pair = lastMessageTable->get(lmit->next());
+ }
+ delete lmit;
+ delete lastMessageTable;
+ }
+ if (pendingTransactionBuilder != NULL)
+ delete pendingTransactionBuilder;
+ {
+ SetIterator<int64_t, Hashset<RejectedMessage *> *> *rmit = getKeyIterator(rejectedMessageWatchVectorTable);
+ while(rmit->hasNext()) {
+ int64_t machineid = rmit->next();
+ Hashset<RejectedMessage *> * rmset = rejectedMessageWatchVectorTable->get(machineid);
+ SetIterator<RejectedMessage *, RejectedMessage *> * mit = rmset->iterator();
+ while (mit->hasNext()) {
+ RejectedMessage * rm = mit->next();
+ delete rm;
+ }
+ delete mit;
+ delete rmset;
+ }
+ delete rmit;
+ delete rejectedMessageWatchVectorTable;
+ }
+ delete arbitratorTable;
+ delete liveAbortTable;
+ {
+ SetIterator<int64_t, Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *> *partsit = getKeyIterator(newTransactionParts);
+ while (partsit->hasNext()) {
+ int64_t machineId = partsit->next();
+ Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *parts = newTransactionParts->get(machineId);
+ delete parts;
+ }
+ delete partsit;
+ delete newTransactionParts;
+ }
+ {
+ 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);
+ delete parts;
+ }
+ delete partsit;
+ delete newCommitParts;
+ }
+ delete lastArbitratedTransactionNumberByArbitratorTable;
+ delete liveTransactionBySequenceNumberTable;
+ delete liveTransactionByTransactionIdTable;
+ {
+ 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);
+ {
+ SetIterator<int64_t, Commit *> *clientit = getKeyIterator(commitForClientTable);
+ while (clientit->hasNext()) {
+ int64_t id = clientit->next();
+ delete commitForClientTable->get(id);
+ }
+ delete clientit;
+ }
+
+ delete commitForClientTable;
+ }
+ delete liveit;
+ delete liveCommitsTable;
+ }
+ delete liveCommitsByKeyTable;
+ delete lastCommitSeenSequenceNumberByArbitratorTable;
+ delete rejectedSlotVector;
+ {
+ uint size = pendingTransactionQueue->size();
+ for (uint iter = 0; iter < size; iter++) {
+ delete pendingTransactionQueue->get(iter);
+ }
+ delete pendingTransactionQueue;
+ }
+ delete pendingSendArbitrationEntriesToDelete;
+ delete transactionPartsSent;
+ delete outstandingTransactionStatus;
+ delete liveAbortsGeneratedByLocal;
+ delete offlineTransactionsCommittedAndAtServer;
+ delete localCommunicationTable;
+ delete lastTransactionSeenFromMachineFromServer;
+ {
+ for(uint i = 0; i < pendingSendArbitrationRounds->size(); i++) {
+ delete pendingSendArbitrationRounds->get(i);
+ }
+ delete pendingSendArbitrationRounds;
+ }
+ if (lastTransactionPartsSent != NULL)
+ delete lastTransactionPartsSent;
+ delete lastArbitrationDataLocalSequenceNumberSeenFromArbitrator;
+}
+
/**
* Init all the stuff needed for for table usage
*/
void Table::init() {
// Init helper objects
- random = new Random();
+ random = new SecureRandom();
buffer = new SlotBuffer();
// init data structs
- committedKeyValueTable = new Hashtable<IoTString *, KeyValue *>();
- speculatedKeyValueTable = new Hashtable<IoTString *, KeyValue *>();
- pendingTransactionSpeculatedKeyValueTable = new Hashtable<IoTString *, KeyValue *>();
- liveNewKeyTable = new Hashtable<IoTString *, NewKey *>();
- lastMessageTable = new Hashtable<int64_t, Pair<int64_t, Liveness *> >();
+ committedKeyValueTable = new Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals>();
+ speculatedKeyValueTable = new Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals>();
+ pendingTransactionSpeculatedKeyValueTable = new Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals>();
+ liveNewKeyTable = new Hashtable<IoTString *, NewKey *, uintptr_t, 0, hashString, StringEquals >();
+ lastMessageTable = new Hashtable<int64_t, Pair<int64_t, Liveness *> * >();
rejectedMessageWatchVectorTable = new Hashtable<int64_t, Hashset<RejectedMessage *> * >();
- arbitratorTable = new Hashtable<IoTString *, int64_t>();
- liveAbortTable = new Hashtable<Pair<int64_t, int64_t>, Abort *>();
- newTransactionParts = new Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t>, TransactionPart *> *>();
- newCommitParts = new Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t>, CommitPart *> *>();
+ arbitratorTable = new Hashtable<IoTString *, int64_t, uintptr_t, 0, hashString, StringEquals>();
+ liveAbortTable = new Hashtable<Pair<int64_t, int64_t> *, Abort *, uintptr_t, 0, pairHashFunction, pairEquals>();
+ newTransactionParts = new Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *>();
+ newCommitParts = new Hashtable<int64_t, Hashtable<Pair<int64_t, int32_t> *, CommitPart *, uintptr_t, 0, pairHashFunction, pairEquals> *>();
lastArbitratedTransactionNumberByArbitratorTable = new Hashtable<int64_t, int64_t>();
liveTransactionBySequenceNumberTable = new Hashtable<int64_t, Transaction *>();
- liveTransactionByTransactionIdTable = new Hashtable<Pair<int64_t, int64_t>, Transaction *>();
- liveCommitsTable = new Hashtable<int64_t, Hashtable<int64_t, Commit *> >();
- liveCommitsByKeyTable = new Hashtable<IoTString *, Commit *>();
+ liveTransactionByTransactionIdTable = new Hashtable<Pair<int64_t, int64_t> *, Transaction *, uintptr_t, 0, pairHashFunction, pairEquals>();
+ liveCommitsTable = new Hashtable<int64_t, Hashtable<int64_t, Commit *> * >();
+ liveCommitsByKeyTable = new Hashtable<IoTString *, Commit *, uintptr_t, 0, hashString, StringEquals>();
lastCommitSeenSequenceNumberByArbitratorTable = new Hashtable<int64_t, int64_t>();
rejectedSlotVector = new Vector<int64_t>();
pendingTransactionQueue = new Vector<Transaction *>();
transactionPartsSent = new Hashtable<Transaction *, Vector<int32_t> *>();
outstandingTransactionStatus = new Hashtable<int64_t, TransactionStatus *>();
liveAbortsGeneratedByLocal = new Hashtable<int64_t, Abort *>();
- offlineTransactionsCommittedAndAtServer = new Hashset<Pair<int64_t, int64_t> >();
- localCommunicationTable = new Hashtable<int64_t, Pair<IoTString *, int32_t> >();
+ offlineTransactionsCommittedAndAtServer = new Hashset<Pair<int64_t, int64_t> *, uintptr_t, 0, pairHashFunction, pairEquals>();
+ localCommunicationTable = new Hashtable<int64_t, Pair<IoTString *, int32_t> *>();
lastTransactionSeenFromMachineFromServer = new Hashtable<int64_t, int64_t>();
pendingSendArbitrationRounds = new Vector<ArbitrationRound *>();
lastArbitrationDataLocalSequenceNumberSeenFromArbitrator = new Hashtable<int64_t, int64_t>();
array->set(0, s);
// update local block chain
validateAndUpdate(array, true);
+ delete array;
} else if (array->length() == 1) {
// in case we did push the slot BUT we failed to init it
validateAndUpdate(array, true);
+ delete array;
} else {
+ delete array;
throw new Error("Error on initialization");
}
}
// Just pull the latest slots from the server
Array<Slot *> *newslots = cloud->getSlots(sequenceNumber + 1);
validateAndUpdate(newslots, true);
+ delete newslots;
sendToServer(NULL);
updateLiveTransactionsAndStatus();
}
void Table::addLocalCommunication(int64_t arbitrator, IoTString *hostName, int portNumber) {
- localCommunicationTable->put(arbitrator, Pair<IoTString *, int32_t>(hostName, portNumber));
+ localCommunicationTable->put(arbitrator, new Pair<IoTString *, int32_t>(hostName, portNumber));
}
int64_t Table::getArbitrator(IoTString *key) {
}
void Table::close() {
- cloud->close();
+ cloud->closeCloud();
}
IoTString *Table::getCommitted(IoTString *key) {
KeyValue *kv = committedKeyValueTable->get(key);
if (kv != NULL) {
- return kv->getValue();
+ return new IoTString(kv->getValue());
} else {
return NULL;
}
}
if (kv != NULL) {
- return kv->getValue();
+ return new IoTString(kv->getValue());
} else {
return NULL;
}
if (kv != NULL) {
pendingTransactionBuilder->addKVGuard(new KeyValue(key, kv->getValue()));
- return kv->getValue();
+ return new IoTString(kv->getValue());
} else {
pendingTransactionBuilder->addKVGuard(new KeyValue(key, NULL));
return NULL;
if (kv != NULL) {
pendingTransactionBuilder->addKVGuard(new KeyValue(key, kv->getValue()));
- return kv->getValue();
+ return new IoTString(kv->getValue());
} else {
pendingTransactionBuilder->addKVGuard(new KeyValue(key, NULL));
return NULL;
try {
Array<Slot *> *newSlots = cloud->getSlots(sequenceNumber + 1);
validateAndUpdate(newSlots, false);
+ delete newSlots;
sendToServer(NULL);
updateLiveTransactionsAndStatus();
return true;
} catch (Exception *e) {
- for (int64_t m : localCommunicationTable->keySet()) {
+ SetIterator<int64_t, Pair<IoTString *, int32_t> *> *kit = getKeyIterator(localCommunicationTable);
+ while (kit->hasNext()) {
+ int64_t m = kit->next();
updateFromLocal(m);
}
+ delete kit;
}
return false;
bool Table::createNewKey(IoTString *keyName, int64_t machineId) {
while (true) {
- if (!arbitratorTable->contains(keyName)) {
+ if (arbitratorTable->contains(keyName)) {
// There is already an arbitrator
return false;
}
void Table::startTransaction() {
// Create a new transaction, invalidates any old pending transactions.
+ if (pendingTransactionBuilder != NULL)
+ delete pendingTransactionBuilder;
pendingTransactionBuilder = new PendingTransaction(localMachineId);
}
-void Table::addKV(IoTString *key, IoTString *value) {
-
+void Table::put(IoTString *key, IoTString *value) {
// Make sure it is a valid key
if (!arbitratorTable->contains(key)) {
throw new Error("Key not Found.");
}
// Add the key value to this transaction
- KeyValue *kv = new KeyValue(key, value);
+ KeyValue *kv = new KeyValue(new IoTString(key), new IoTString(value));
pendingTransactionBuilder->addKV(kv);
}
pendingTransactionQueue->add(newTransaction);
} else {
arbitrateOnLocalTransaction(newTransaction);
+ delete newTransaction;
updateLiveStateFromLocal();
}
-
+ if (pendingTransactionBuilder != NULL)
+ delete pendingTransactionBuilder;
+
pendingTransactionBuilder = new PendingTransaction(localMachineId);
try {
} catch (ServerException *e) {
Hashset<int64_t> *arbitratorTriedAndFailed = new Hashset<int64_t>();
- for (Iterator<Transaction *> *iter = pendingTransactionQueue->iterator(); iter->hasNext(); ) {
- Transaction *transaction = iter->next();
+ uint size = pendingTransactionQueue->size();
+ uint oldindex = 0;
+ for (uint iter = 0; iter < size; iter++) {
+ Transaction *transaction = pendingTransactionQueue->get(iter);
+ pendingTransactionQueue->set(oldindex++, pendingTransactionQueue->get(iter));
if (arbitratorTriedAndFailed->contains(transaction->getArbitrator())) {
// Already contacted this client so ignore all attempts to contact this client
Pair<bool, bool> sendReturn = sendTransactionToLocal(transaction);
- if (sendReturn->getFirst()) {
+ if (sendReturn.getFirst()) {
// Failed to contact over local
arbitratorTriedAndFailed->add(transaction->getArbitrator());
} else {
// Successful contact or should not contact
- if (sendReturn->getSecond()) {
+ if (sendReturn.getSecond()) {
// did arbitrate
- iter->remove();
+ delete transaction;
+ oldindex--;
}
}
}
+ pendingTransactionQueue->setSize(oldindex);
}
updateLiveStateFromLocal();
return localSequenceNumber;
}
-bool Table::sendToServer(NewKey *newKey) {
- bool fromRetry = false;
- try {
- if (hadPartialSendToServer) {
- Array<Slot *> *newSlots = cloud->getSlots(sequenceNumber + 1);
- if (newSlots->length() == 0) {
- fromRetry = true;
- ThreeTuple<bool, bool, Array<Slot *> *> sendSlotsReturn = sendSlotsToServer(lastSlotAttemptedToSend, lastNewSize, lastIsNewKey);
-
- if (sendSlotsReturn->getFirst()) {
- if (newKey != NULL) {
- if (lastInsertedNewKey && (lastNewKey->getKey() == newKey->getKey()) && (lastNewKey->getMachineID() == newKey->getMachineID())) {
- newKey = NULL;
- }
+NewKey * Table::handlePartialSend(NewKey * newKey) {
+ //Didn't receive acknowledgement for last send
+ //See if the server has received a newer slot
+
+ Array<Slot *> *newSlots = cloud->getSlots(sequenceNumber + 1);
+ if (newSlots->length() == 0) {
+ //Retry sending old slot
+ bool wasInserted = false;
+ bool sendSlotsReturn = sendSlotsToServer(lastSlotAttemptedToSend, lastNewSize, lastIsNewKey, &wasInserted, &newSlots);
+
+ if (sendSlotsReturn) {
+ if (newKey != NULL) {
+ if (lastInsertedNewKey && (lastNewKey->getKey() == newKey->getKey()) && (lastNewKey->getMachineID() == newKey->getMachineID())) {
+ newKey = NULL;
+ }
+ }
+
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
+ transaction->resetServerFailure();
+ // Update which transactions parts still need to be sent
+ transaction->removeSentParts(lastTransactionPartsSent->get(transaction));
+ // Add the transaction status to the outstanding list
+ outstandingTransactionStatus->put(transaction->getSequenceNumber(), transaction->getTransactionStatus());
+
+ // Update the transaction status
+ transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentPartial);
+
+ // Check if all the transaction parts were successfully
+ // sent and if so then remove it from pending
+ if (transaction->didSendAllParts()) {
+ transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentFully);
+ pendingTransactionQueue->remove(transaction);
+ }
+ }
+ delete trit;
+ } else {
+ if (checkSend(newSlots, lastSlotAttemptedToSend)) {
+ if (newKey != NULL) {
+ if (lastInsertedNewKey && (lastNewKey->getKey() == newKey->getKey()) && (lastNewKey->getMachineID() == newKey->getMachineID())) {
+ newKey = NULL;
}
-
- for (Transaction *transaction : lastTransactionPartsSent->keySet()) {
+ }
+
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
+ transaction->resetServerFailure();
+
+ // Update which transactions parts still need to be sent
+ transaction->removeSentParts(lastTransactionPartsSent->get(transaction));
+
+ // Add the transaction status to the outstanding list
+ outstandingTransactionStatus->put(transaction->getSequenceNumber(), transaction->getTransactionStatus());
+
+ // Update the transaction status
+ transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentPartial);
+
+ // Check if all the transaction parts were successfully sent and if so then remove it from pending
+ if (transaction->didSendAllParts()) {
+ transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentFully);
+ pendingTransactionQueue->remove(transaction);
+ } else {
transaction->resetServerFailure();
- // Update which transactions parts still need to be sent
- transaction->removeSentParts(lastTransactionPartsSent->get(transaction));
- // Add the transaction status to the outstanding list
- outstandingTransactionStatus->put(transaction->getSequenceNumber(), transaction->getTransactionStatus());
-
- // Update the transaction status
- transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentPartial);
-
- // Check if all the transaction parts were successfully
- // sent and if so then remove it from pending
- if (transaction->didSendAllParts()) {
- transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentFully);
- pendingTransactionQueue->remove(transaction);
- }
- }
- } else {
- newSlots = sendSlotsReturn->getThird();
- bool isInserted = false;
- for (uint si = 0; si < newSlots->length(); si++) {
- Slot *s = newSlots->get(si);
- if ((s->getSequenceNumber() == lastSlotAttemptedToSend->getSequenceNumber()) && (s->getMachineID() == localMachineId)) {
- isInserted = true;
- break;
- }
- }
-
- for (uint si = 0; si < newSlots->length(); si++) {
- Slot *s = newSlots->get(si);
- if (isInserted) {
- break;
- }
-
- // Process each entry in the slot
- for (Entry *entry : s->getEntries()) {
- if (entry->getType() == TypeLastMessage) {
- LastMessage *lastMessage = (LastMessage *)entry;
- if ((lastMessage->getMachineID() == localMachineId) && (lastMessage->getSequenceNumber() == lastSlotAttemptedToSend->getSequenceNumber())) {
- isInserted = true;
- break;
- }
- }
- }
- }
-
- if (isInserted) {
- if (newKey != NULL) {
- if (lastInsertedNewKey && (lastNewKey->getKey() == newKey->getKey()) && (lastNewKey->getMachineID() == newKey->getMachineID())) {
- newKey = NULL;
- }
- }
-
- for (Transaction *transaction : lastTransactionPartsSent->keySet()) {
- transaction->resetServerFailure();
-
- // Update which transactions parts still need to be sent
- transaction->removeSentParts(lastTransactionPartsSent->get(transaction));
-
- // Add the transaction status to the outstanding list
- outstandingTransactionStatus->put(transaction->getSequenceNumber(), transaction->getTransactionStatus());
-
- // Update the transaction status
- transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentPartial);
-
- // Check if all the transaction parts were successfully sent and if so then remove it from pending
- if (transaction->didSendAllParts()) {
- transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentFully);
- pendingTransactionQueue->remove(transaction);
- } else {
- transaction->resetServerFailure();
- // Set the transaction sequence number back to nothing
- if (!transaction->didSendAPartToServer()) {
- transaction->setSequenceNumber(-1);
- }
- }
+ // Set the transaction sequence number back to nothing
+ if (!transaction->didSendAPartToServer()) {
+ transaction->setSequenceNumber(-1);
}
}
}
-
- for (Transaction *transaction : lastTransactionPartsSent->keySet()) {
+ delete trit;
+ }
+ }
+
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
+ transaction->resetServerFailure();
+ // Set the transaction sequence number back to nothing
+ if (!transaction->didSendAPartToServer()) {
+ transaction->setSequenceNumber(-1);
+ }
+ }
+ delete trit;
+
+ if (newSlots->length() != 0) {
+ // insert into the local block chain
+ validateAndUpdate(newSlots, true);
+ }
+ } else {
+ if (checkSend(newSlots, lastSlotAttemptedToSend)) {
+ if (newKey != NULL) {
+ if (lastInsertedNewKey && (lastNewKey->getKey() == newKey->getKey()) && (lastNewKey->getMachineID() == newKey->getMachineID())) {
+ newKey = NULL;
+ }
+ }
+
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
+ transaction->resetServerFailure();
+
+ // Update which transactions parts still need to be sent
+ transaction->removeSentParts(lastTransactionPartsSent->get(transaction));
+
+ // Add the transaction status to the outstanding list
+ outstandingTransactionStatus->put(transaction->getSequenceNumber(), transaction->getTransactionStatus());
+
+ // Update the transaction status
+ transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentPartial);
+
+ // Check if all the transaction parts were successfully sent and if so then remove it from pending
+ if (transaction->didSendAllParts()) {
+ transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentFully);
+ pendingTransactionQueue->remove(transaction);
+ } else {
transaction->resetServerFailure();
// Set the transaction sequence number back to nothing
if (!transaction->didSendAPartToServer()) {
transaction->setSequenceNumber(-1);
}
}
-
- if (sendSlotsReturn->getThird()->length() != 0) {
- // insert into the local block chain
- validateAndUpdate(sendSlotsReturn->getThird(), true);
- }
- // continue;
- } else {
- bool isInserted = false;
- for (uint si = 0; si < newSlots->length(); si++) {
- Slot *s = newSlots->get(si);
- if ((s->getSequenceNumber() == lastSlotAttemptedToSend->getSequenceNumber()) && (s->getMachineID() == localMachineId)) {
- isInserted = true;
- break;
- }
- }
-
- for (uint si = 0; si < newSlots->length(); si++) {
- Slot *s = newSlots->get(si);
- if (isInserted) {
- break;
- }
-
- // Process each entry in the slot
- for (Entry *entry : s->getEntries()) {
-
- if (entry->getType() == TypeLastMessage) {
- LastMessage *lastMessage = (LastMessage *)entry;
- if ((lastMessage->getMachineID() == localMachineId) && (lastMessage->getSequenceNumber() == lastSlotAttemptedToSend->getSequenceNumber())) {
- isInserted = true;
- break;
- }
- }
- }
- }
-
- if (isInserted) {
- if (newKey != NULL) {
- if (lastInsertedNewKey && (lastNewKey->getKey() == newKey->getKey()) && (lastNewKey->getMachineID() == newKey->getMachineID())) {
- newKey = NULL;
- }
- }
-
- for (Transaction *transaction : lastTransactionPartsSent->keySet()) {
- transaction->resetServerFailure();
-
- // Update which transactions parts still need to be sent
- transaction->removeSentParts(lastTransactionPartsSent->get(transaction));
-
- // Add the transaction status to the outstanding list
- outstandingTransactionStatus->put(transaction->getSequenceNumber(), transaction->getTransactionStatus());
-
- // Update the transaction status
- transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentPartial);
-
- // Check if all the transaction parts were successfully sent and if so then remove it from pending
- if (transaction->didSendAllParts()) {
- transaction->getTransactionStatus()->setStatus(TransactionStatus_StatusSentFully);
- pendingTransactionQueue->remove(transaction);
- } else {
- transaction->resetServerFailure();
- // Set the transaction sequence number back to nothing
- if (!transaction->didSendAPartToServer()) {
- transaction->setSequenceNumber(-1);
- }
- }
- }
- } else {
- for (Transaction *transaction : lastTransactionPartsSent->keySet()) {
- transaction->resetServerFailure();
- // Set the transaction sequence number back to nothing
- if (!transaction->didSendAPartToServer()) {
- transaction->setSequenceNumber(-1);
- }
- }
+ }
+ delete trit;
+ } else {
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(lastTransactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
+ transaction->resetServerFailure();
+ // Set the transaction sequence number back to nothing
+ if (!transaction->didSendAPartToServer()) {
+ transaction->setSequenceNumber(-1);
}
-
- // insert into the local block chain
- validateAndUpdate(newSlots, true);
}
+ delete trit;
}
- } catch (ServerException *e) {
- throw e;
+
+ // insert into the local block chain
+ validateAndUpdate(newSlots, true);
}
+ delete newSlots;
+ return newKey;
+}
-
+bool Table::sendToServer(NewKey *newKey) {
+ if (hadPartialSendToServer) {
+ newKey = handlePartialSend(newKey);
+ }
try {
// While we have stuff that needs inserting into the block chain
while ((pendingTransactionQueue->size() > 0) || (pendingSendArbitrationRounds->size() > 0) || (newKey != NULL)) {
-
- fromRetry = false;
-
if (hadPartialSendToServer) {
throw new Error("Should Be error free");
}
-
-
-
+
// If there is a new key with same name then end
if ((newKey != NULL) && arbitratorTable->contains(newKey->getKey())) {
return false;
}
// Create the slot
- Slot *slot = new Slot(this, sequenceNumber + 1, localMachineId, buffer->getSlot(sequenceNumber)->getHMAC(), localSequenceNumber);
+ Slot *slot = new Slot(this, sequenceNumber + 1, localMachineId, new Array<char>(buffer->getSlot(sequenceNumber)->getHMAC()), localSequenceNumber);
localSequenceNumber++;
// Try to fill the slot with data
- ThreeTuple<bool, int32_t, bool> fillSlotsReturn = fillSlot(slot, false, newKey);
- bool needsResize = fillSlotsReturn->getFirst();
- int newSize = fillSlotsReturn->getSecond();
- bool insertedNewKey = fillSlotsReturn->getThird();
+ int newSize = 0;
+ bool insertedNewKey = false;
+ bool needsResize = fillSlot(slot, false, newKey, newSize, insertedNewKey);
if (needsResize) {
// Reset which transaction to send
- for (Transaction *transaction : transactionPartsSent->keySet()) {
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
// Set the transaction sequence number back to nothing
transaction->setSequenceNumber(-1);
}
}
+ delete trit;
// Clear the sent data since we are trying again
pendingSendArbitrationEntriesToDelete->clear();
transactionPartsSent->clear();
// We needed a resize so try again
- fillSlot(slot, true, newKey);
+ fillSlot(slot, true, newKey, newSize, insertedNewKey);
}
lastSlotAttemptedToSend = slot;
lastInsertedNewKey = insertedNewKey;
lastNewSize = newSize;
lastNewKey = newKey;
- lastTransactionPartsSent = new Hashtable<Transaction *, Vector<int32_t> * >(transactionPartsSent);
+ if (lastTransactionPartsSent != NULL)
+ delete lastTransactionPartsSent;
+ lastTransactionPartsSent = transactionPartsSent->clone();
lastPendingSendArbitrationEntriesToDelete = new Vector<Entry *>(pendingSendArbitrationEntriesToDelete);
+ Array<Slot *> * newSlots = NULL;
+ bool wasInserted = false;
+ bool sendSlotsReturn = sendSlotsToServer(slot, newSize, newKey != NULL, &wasInserted, &newSlots);
- ThreeTuple<bool, bool, Array<Slot *> *> sendSlotsReturn = sendSlotsToServer(slot, newSize, newKey != NULL);
-
- if (sendSlotsReturn->getFirst()) {
-
+ if (sendSlotsReturn) {
// Did insert into the block chain
-
if (insertedNewKey) {
// This slot was what was inserted not a previous slot
-
// New Key was successfully inserted into the block chain so dont want to insert it again
newKey = NULL;
}
// Remove the aborts and commit parts that were sent from the pending to send queue
- for (Iterator<ArbitrationRound *> *iter = pendingSendArbitrationRounds->iterator(); iter->hasNext(); ) {
- ArbitrationRound *round = iter->next();
+ uint size = pendingSendArbitrationRounds->size();
+ uint oldcount = 0;
+ for (uint i = 0; i < size; i++) {
+ ArbitrationRound *round = pendingSendArbitrationRounds->get(i);
round->removeParts(pendingSendArbitrationEntriesToDelete);
- if (round->isDoneSending()) {
- // Sent all the parts
- iter->remove();
- }
+ if (!round->isDoneSending()) {
+ //Add part back in
+ pendingSendArbitrationRounds->set(oldcount++,
+ pendingSendArbitrationRounds->get(i));
+ } else
+ delete pendingSendArbitrationRounds->get(i);
}
+ pendingSendArbitrationRounds->setSize(oldcount);
- for (Transaction *transaction : transactionPartsSent->keySet()) {
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
transaction->resetServerFailure();
// Update which transactions parts still need to be sent
pendingTransactionQueue->remove(transaction);
}
}
+ delete trit;
} else {
// Reset which transaction to send
- for (Transaction *transaction : transactionPartsSent->keySet()) {
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
// Set the transaction sequence number back to nothing
transaction->setSequenceNumber(-1);
}
}
+ delete trit;
}
// Clear the sent data in preparation for next send
pendingSendArbitrationEntriesToDelete->clear();
transactionPartsSent->clear();
- if (sendSlotsReturn->getThird()->length() != 0) {
+ if (newSlots->length() != 0) {
// insert into the local block chain
- validateAndUpdate(sendSlotsReturn->getThird(), true);
+ validateAndUpdate(newSlots, true);
}
+ delete newSlots;
}
-
} 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
- for (Transaction *transaction : transactionPartsSent->keySet()) {
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
// Set the transaction sequence number back to nothing
transaction->setSequenceNumber(-1);
}
}
+ delete trit;
} else {
// There was a partial send to the server
hadPartialSendToServer = true;
// Nothing was able to be sent to the server so just clear these data structures
- for (Transaction *transaction : transactionPartsSent->keySet()) {
+ SetIterator<Transaction *, Vector<int> *> *trit = getKeyIterator(transactionPartsSent);
+ while (trit->hasNext()) {
+ Transaction *transaction = trit->next();
transaction->resetNextPartToSend();
transaction->setServerFailure();
}
+ delete trit;
}
pendingSendArbitrationEntriesToDelete->clear();
}
bool Table::updateFromLocal(int64_t machineId) {
- Pair<IoTString *, int32_t> localCommunicationInformation = localCommunicationTable->get(machineId);
- if (localCommunicationInformation == NULL) {
- // Cant talk to that device locally so do nothing
+ if (!localCommunicationTable->contains(machineId))
return false;
- }
+
+ 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);
}
for (int i = 0; i < numberOfEntries; i++) {
char type = bbDecode->get();
if (type == TypeAbort) {
- Abort *abort = (Abort)Abort_decode(NULL, bbDecode);
+ Abort *abort = (Abort *)Abort_decode(NULL, bbDecode);
processEntry(abort);
} else if (type == TypeCommitPart) {
- CommitPart *commitPart = (CommitPart)CommitPart_decode(NULL, bbDecode);
+ CommitPart *commitPart = (CommitPart *)CommitPart_decode(NULL, bbDecode);
processEntry(commitPart);
}
}
Pair<bool, bool> Table::sendTransactionToLocal(Transaction *transaction) {
// Get the devices local communications
- Pair<IoTString *, int32_t> localCommunicationInformation = localCommunicationTable->get(transaction->getArbitrator());
-
- if (localCommunicationInformation == NULL) {
- // Cant talk to that device locally so do nothing
+ if (!localCommunicationTable->contains(transaction->getArbitrator()))
return Pair<bool, bool>(true, false);
- }
+
+ 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());
}
// Make the send data size
Array<char> *sendData = new Array<char>(sendDataSize);
- ByteBuffer *bbEncode = ByteBuffer.wrap(sendData);
+ ByteBuffer *bbEncode = ByteBuffer_wrap(sendData);
// 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());
localSequenceNumber++;
for (int i = 0; i < numberOfEntries; i++) {
char type = bbDecode->get();
if (type == TypeAbort) {
- Abort *abort = (Abort)Abort_decode(NULL, bbDecode);
+ Abort *abort = (Abort *)Abort_decode(NULL, bbDecode);
if ((abort->getTransactionMachineId() == localMachineId) && (abort->getTransactionClientLocalSequenceNumber() == transaction->getClientLocalSequenceNumber())) {
foundAbort = true;
processEntry(abort);
} else if (type == TypeCommitPart) {
- CommitPart *commitPart = (CommitPart)CommitPart_decode(NULL, bbDecode);
+ CommitPart *commitPart = (CommitPart *)CommitPart_decode(NULL, bbDecode);
processEntry(commitPart);
}
}
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 *transaction = new Transaction();
for (int i = 0; i < numberOfParts; i++) {
bbDecode->get();
- TransactionPart *newPart = (TransactionPart)TransactionPart.decode(NULL, bbDecode);
+ TransactionPart *newPart = (TransactionPart *)TransactionPart_decode(NULL, bbDecode);
transaction->addPartDecode(newPart);
}
// Arbitrate on transaction and pull relevant return data
Pair<bool, bool> localArbitrateReturn = arbitrateOnLocalTransaction(transaction);
- couldArbitrate = localArbitrateReturn->getFirst();
- didCommit = localArbitrateReturn->getSecond();
+ couldArbitrate = localArbitrateReturn.getFirst();
+ didCommit = localArbitrateReturn.getSecond();
updateLiveStateFromLocal();
// 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);
- for (int64_t localSequenceNumber : 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++) {
+ int64_t localSequenceNumber = abortLocalSequenceNumbers->get(i);
if (localSequenceNumber <= lastArbitratedSequenceNumberSeen) {
continue;
}
// 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);
-
- for (int64_t localSequenceNumber : 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++) {
+ int64_t localSequenceNumber = commitLocalSequenceNumbers->get(clsi);
Commit *commit = commitForClientTable->get(localSequenceNumber);
if (localSequenceNumber <= lastArbitratedSequenceNumberSeen) {
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();
+ }
}
}
}
}
bbEncode->putInt(unseenArbitrations->size());
- for (Entry *entry : unseenArbitrations) {
+ uint size = unseenArbitrations->size();
+ for (uint i = 0; i < size; i++) {
+ Entry *entry = unseenArbitrations->get(i);
entry->encode(bbEncode);
}
-
localSequenceNumber++;
return returnData;
}
-ThreeTuple<bool, bool, Array<Slot *> *> Table::sendSlotsToServer(Slot *slot, int newSize, bool isNewKey) {
- bool attemptedToSendToServerTmp = attemptedToSendToServer;
- attemptedToSendToServer = true;
-
- bool inserted = false;
- bool lastTryInserted = false;
+/** Checks whether a given slot was sent using new slots in
+ array. Returns true if sent and false otherwise. */
- Array<Slot *> *array = cloud->putSlot(slot, newSize);
- if (array == NULL) {
- array = new Array<Slot *>();
- array->set(0, slot);
- rejectedSlotVector->clear();
- inserted = true;
- } else {
- if (array->length() == 0) {
- throw new Error("Server Error: Did not send any slots");
+bool Table::checkSend(Array<Slot *> * array, Slot *checkSlot) {
+ uint size = array->length();
+ for (uint i = 0; i < size; i++) {
+ Slot *s = array->get(i);
+ if ((s->getSequenceNumber() == checkSlot->getSequenceNumber()) && (s->getMachineID() == localMachineId)) {
+ return true;
}
-
- // if (attemptedToSendToServerTmp) {
- if (hadPartialSendToServer) {
-
- bool isInserted = false;
- for (Slot *s : array) {
- if ((s->getSequenceNumber() == slot->getSequenceNumber()) && (s->getMachineID() == localMachineId)) {
- isInserted = true;
- break;
+ }
+
+ //Also need to see if other machines acknowledged our message
+ for (uint i = 0; i < size; i++) {
+ Slot *s = array->get(i);
+
+ // 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);
+
+ if (entry->getType() == TypeLastMessage) {
+ LastMessage *lastMessage = (LastMessage *)entry;
+
+ if ((lastMessage->getMachineID() == localMachineId) && (lastMessage->getSequenceNumber() == checkSlot->getSequenceNumber())) {
+ return true;
}
}
+ }
+ }
+ //Not found
+ return false;
+}
- for (Slot *s : array) {
- if (isInserted) {
- break;
- }
+/** Method tries to send slot to server. Returns status in tuple.
+ isInserted returns whether last un-acked send (if any) was
+ successful. Returns whether send was confirmed.x
+ */
- // Process each entry in the slot
- for (Entry *entry : s->getEntries()) {
+bool Table::sendSlotsToServer(Slot *slot, int newSize, bool isNewKey, bool *isInserted, Array<Slot *> **array) {
+ attemptedToSendToServer = true;
- if (entry->getType() == TypeLastMessage) {
- LastMessage *lastMessage = (LastMessage *)entry;
+ *array = cloud->putSlot(slot, newSize);
+ if (*array == NULL) {
+ *array = new Array<Slot *>(1);
+ (*array)->set(0, slot);
+ rejectedSlotVector->clear();
+ *isInserted = false;
+ return true;
+ } else {
+ if ((*array)->length() == 0) {
+ throw new Error("Server Error: Did not send any slots");
+ }
- if ((lastMessage->getMachineID() == localMachineId) && (lastMessage->getSequenceNumber() == slot->getSequenceNumber())) {
- isInserted = true;
- break;
- }
- }
- }
- }
+ if (hadPartialSendToServer) {
+ *isInserted = checkSend(*array, slot);
- if (!isInserted) {
+ if (!(*isInserted)) {
rejectedSlotVector->add(slot->getSequenceNumber());
- lastTryInserted = false;
- } else {
- lastTryInserted = true;
}
+
+ return false;
} else {
rejectedSlotVector->add(slot->getSequenceNumber());
- lastTryInserted = false;
+ *isInserted = false;
+ return false;
}
}
-
- return ThreeTuple<bool, bool, Array<Slot *> *>(inserted, lastTryInserted, array);
}
/**
- * Returns false if a resize was needed
+ * Returns true if a resize was needed but not done.
*/
-ThreeTuple<bool, int32_t, bool> Table::fillSlot(Slot *slot, bool resize, NewKey *newKeyEntry) {
- int newSize = 0;
+bool Table::fillSlot(Slot *slot, bool resize, NewKey *newKeyEntry, int & newSize, bool & insertedKey) {
+ newSize = 0;//special value to indicate no resize
if (liveSlotCount > bufferResizeThreshold) {
- resize = true; //Resize is forced
+ resize = true;//Resize is forced
}
if (resize) {
ThreeTuple<bool, bool, int64_t> mandatoryRescueReturn = doMandatoryResuce(slot, resize);
// Extract working variables
- bool needsResize = mandatoryRescueReturn->getFirst();
- bool seenLiveSlot = mandatoryRescueReturn->getSecond();
- int64_t currentRescueSequenceNumber = mandatoryRescueReturn->getThird();
+ bool needsResize = mandatoryRescueReturn.getFirst();
+ bool seenLiveSlot = mandatoryRescueReturn.getSecond();
+ int64_t currentRescueSequenceNumber = mandatoryRescueReturn.getThird();
if (needsResize && !resize) {
- // We need to resize but we are not resizing so return false
- return ThreeTuple<bool, int32_t, bool>(true, NULL, NULL);
+ // We need to resize but we are not resizing so return true to force on retry
+ return true;
}
- bool inserted = false;
+ insertedKey = false;
if (newKeyEntry != NULL) {
newKeyEntry->setSlot(slot);
if (slot->hasSpace(newKeyEntry)) {
slot->addEntry(newKeyEntry);
- inserted = true;
+ insertedKey = true;
}
}
// Clear the transactions, aborts and commits that were sent previously
transactionPartsSent->clear();
pendingSendArbitrationEntriesToDelete->clear();
-
- for (ArbitrationRound *round : pendingSendArbitrationRounds) {
+ uint size = pendingSendArbitrationRounds->size();
+ for (uint i = 0; i < size; i++) {
+ ArbitrationRound *round = pendingSendArbitrationRounds->get(i);
bool isFull = false;
round->generateParts();
Vector<Entry *> *parts = round->getParts();
// Insert pending arbitration data
- for (Entry *arbitrationData : parts) {
+ uint vsize = parts->size();
+ for (uint vi = 0; vi < vsize; vi++) {
+ Entry *arbitrationData = parts->get(vi);
// If it is an abort then we need to set some information
- if (arbitrationData instanceof Abort) {
+ if (arbitrationData->getType() == TypeAbort) {
((Abort *)arbitrationData)->setSequenceNumber(slot->getSequenceNumber());
}
// Fill the remainder of the slot with rescue data
doOptionalRescue(slot, seenLiveSlot, currentRescueSequenceNumber, resize);
- return ThreeTuple<bool, int32_t, bool>(false, newSize, inserted);
+ return false;
}
void Table::doRejectedMessages(Slot *s) {
* 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);
s->addEntry(rm);
} else {
int64_t prev_seqn = -1;
- int i = 0;
+ uint i = 0;
/* Go through list of missing messages */
for (; i < rejectedSlotVector->size(); i++) {
int64_t curr_seqn = rejectedSlotVector->get(i);
// 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);
} else if (currentSequenceNumber == firstIfFull) {
//if there's no space but the entry is about to fall off the queue
- System->out->println("B"); //?
return ThreeTuple<bool, bool, int64_t>(true, seenLiveSlot, currentSequenceNumber);
-
}
}
}
* 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 {
skipcount++;
- if (skipcount > Table_SKIP_THRESHOLD)
- break search;
+ if (skipcount > Table_SKIP_THRESHOLD) {
+ delete liveentries;
+ goto donesearch;
+ }
}
}
+ delete liveentries;
}
+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();
+ }
}
-
+ delete indexer;
+
// If there is a gap, check to see if the server sent us
// everything->
if (firstSeqNum != (sequenceNumber + 1)) {
// 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
// hiding slots
if (!machineSet->isEmpty()) {
- throw new Error("Missing record for machines: " + machineSet);
+ delete machineSet;
+ throw new Error("Missing record for machines: ");
}
}
-
+ delete machineSet;
// Update the size of our local block chain->
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::checkNumSlots(int numberOfSlots) {
if (numberOfSlots != expectedsize) {
- throw new Error("Server Error: Server did not send all slots-> Expected: " + expectedsize + " Received:" + numberOfSlots);
+ throw new Error("Server Error: Server did not send all slots-> Expected: ");
}
}
-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()) {
- Hashtable<Pair<int64_t int32_t>, TransactionPart *> *parts = newTransactionParts->get(machineId);
+ 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
if (transaction == NULL) {
// This is a new transaction that we dont have so make a new one
transaction = new Transaction();
+
+ // Add that part to the transaction
+ transaction->addPartDecode(part);
// Insert this new transaction into the live tables
liveTransactionBySequenceNumberTable->put(part->getSequenceNumber(), transaction);
- liveTransactionByTransactionIdTable->put(part->getTransactionId(), transaction);
+ liveTransactionByTransactionIdTable->put(transaction->getId(), 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();
+ {
+ SetIterator<int64_t, Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *> *partsit = getKeyIterator(newTransactionParts);
+ while (partsit->hasNext()) {
+ int64_t machineId = partsit->next();
+ Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *parts = newTransactionParts->get(machineId);
+ delete parts;
+ }
+ delete partsit;
+ newTransactionParts->clear();
+ }
}
void Table::arbitrateFromServer() {
-
if (liveTransactionBySequenceNumberTable->size() == 0) {
// Nothing to arbitrate on so move on
return;
}
// 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 *, uintptr_t, 0, hashString, StringEquals> *speculativeTableTmp = new Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals>();
// 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) {
continue;
}
-
if (!transaction->isComplete()) {
// Will arbitrate in incorrect order if we continue so just break
// Most likely this
break;
}
-
// 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());
if (transaction->evaluateGuard(committedKeyValueTable, speculativeTableTmp, NULL)) {
// Guard evaluated as true
-
// Update the local changes so we can make the commit
- for (KeyValue *kv : 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;
localArbitrationSequenceNumber++;
// Add all the new keys to the commit
- for (KeyValue *kv : speculativeTableTmp->values()) {
+ SetIterator<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals> *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);
}
}
+ delete speculativeTableTmp;
if ((newCommit != NULL) || (generatedAborts->size() > 0)) {
ArbitrationRound *arbitrationRound = new ArbitrationRound(newCommit, generatedAborts);
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
- for (KeyValue *kv : 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);
}
}
}
/**
- * Compacts the arbitration data my merging commits and aggregating
+ * Compacts the arbitration data by merging commits and aggregating
* aborts so that a single large push of commits can be done instead
* of many small updates
*/
}
ArbitrationRound *lastRound = pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size() - 1);
- if (lastRound->didSendPart()) {
+ if (lastRound->getDidSendPart()) {
return false;
}
bool hadCommit = (lastRound->getCommit() == NULL);
bool gotNewCommit = false;
- int numberToDelete = 1;
+ uint 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->didSendPart()) {
+ if (round->isFull() || round->getDidSendPart()) {
// Stop since there is a part that cannot be compacted and we
// need to compact in order
break;
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) {
- // Cant compact since it would be too large
+ if (newSize > ArbitrationRound_MAX_PARTS) {
+ // Can't compact since it would be too large
+ if (lastRound->getCommit() != newCommit &&
+ round->getCommit() != newCommit)
+ delete newCommit;
break;
}
-
// Set the new compacted part
+ if (lastRound->getCommit() == newCommit)
+ lastRound->setCommit(NULL);
+ if (round->getCommit() == newCommit)
+ round->setCommit(NULL);
+
+ if (lastRound->getCommit() != NULL) {
+ Commit * oldcommit = lastRound->getCommit();
+ lastRound->setCommit(NULL);
+ delete oldcommit;
+ }
lastRound->setCommit(newCommit);
lastRound->addAborts(round->getAborts());
gotNewCommit = true;
if (numberToDelete != 1) {
// If there is a compaction
// Delete the previous pieces that are now in the new compacted piece
- if (numberToDelete == pendingSendArbitrationRounds->size()) {
- pendingSendArbitrationRounds->clear();
- } else {
- for (int i = 0; i < numberToDelete; i++) {
- pendingSendArbitrationRounds->remove(pendingSendArbitrationRounds->size() - 1);
- }
+ for (uint i = 2; i <= numberToDelete; i++) {
+ delete pendingSendArbitrationRounds->get(pendingSendArbitrationRounds->size()-i);
}
+ pendingSendArbitrationRounds->setSize(pendingSendArbitrationRounds->size() - numberToDelete);
- // Add the new compacted into the pending to send list
pendingSendArbitrationRounds->add(lastRound);
// Should reinsert into the commit processor
* transactions
*/
bool Table::updateCommittedTable() {
-
if (newCommitParts->size() == 0) {
// Nothing new to process
return false;
}
// 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 parts;
}
+ 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);
}
// Go through each new commit one by one
- for (int i = 0; i < commitSequenceNumbers->size(); i++) {
+ for (uint i = 0; i < commitSequenceNumbers->size(); i++) {
int64_t commitSequenceNumber = commitSequenceNumbers->get(i);
Commit *commit = commitForClientTable->get(commitSequenceNumber);
-
// Special processing if a commit is not complete
if (!commit->isComplete()) {
if (i == (commitSequenceNumbers->size() - 1)) {
// Delete it and move on
commit->setDead();
commitForClientTable->remove(commit->getSequenceNumber());
+ delete commit;
continue;
}
}
// 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 arbitration data that we have seen so far
- if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(commit->getMachineId()) != NULL) {
-
+ if (lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->contains(commit->getMachineId())) {
int64_t lastArbitrationSequenceNumber = lastArbitrationDataLocalSequenceNumberSeenFromArbitrator->get(commit->getMachineId());
if (commit->getSequenceNumber() > lastArbitrationSequenceNumber) {
// Is larger
// We have already seen this commit before so need to do the
// full processing on this commit
if (commit->getSequenceNumber() <= lastCommitSeenSequenceNumber) {
-
// 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());
}
}
-
continue;
}
// Get what commits should be edited, these are the commits that
// have live values for their keys
Hashset<Commit *> *commitsToEdit = new Hashset<Commit *>();
- for (KeyValue *kv : commit->getKeyValueUpdateSet()) {
- commitsToEdit->add(liveCommitsByKeyTable->get(kv->getKey()));
+ {
+ SetIterator<KeyValue *, KeyValue *, uintptr_t, 0> *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;
}
- 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
- for (KeyValue *kv : commit->getKeyValueUpdateSet()) {
- previousCommit->invalidateKey(kv->getKey());
+ {
+ SetIterator<KeyValue *, KeyValue *, uintptr_t, 0> *kvit = commit->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
+ previousCommit->invalidateKey(kv->getKey());
+ }
+ delete kvit;
}
// if the commit is now dead then remove it
if (!previousCommit->isLive()) {
- commitForClientTable->remove(previousCommit);
+ commitForClientTable->remove(previousCommit->getSequenceNumber());
+ delete previousCommit;
}
}
}
+ delete commitit;
+ delete commitsToEdit;
// 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
- for (KeyValue *kv : commit->getKeyValueUpdateSet()) {
- committedKeyValueTable->put(kv->getKey(), kv);
- liveCommitsByKeyTable->put(kv->getKey(), commit);
+ {
+ SetIterator<KeyValue *, KeyValue *, uintptr_t, 0> *kvit = commit->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
+ committedKeyValueTable->put(kv->getKey(), kv);
+ liveCommitsByKeyTable->put(kv->getKey(), commit);
+ }
+ 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;
+ uint 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
Hashset<int64_t> *incompleteTransactionArbitrator = new Hashset<int64_t>();
bool didSkip = true;
- for (int i = startIndex; i < transactionSequenceNumbersSorted->size(); i++) {
+ for (uint i = startIndex; i < transactionSequenceNumbersSorted->size(); i++) {
int64_t transactionSequenceNumber = transactionSequenceNumbersSorted->get(i);
Transaction *transaction = liveTransactionBySequenceNumberTable->get(transactionSequenceNumber);
if (transaction->evaluateGuard(committedKeyValueTable, speculatedKeyValueTable, NULL)) {
// Guard evaluated to true so update the speculative table
- for (KeyValue *kv : transaction->getKeyValueUpdateSet()) {
- 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;
}
}
}
}
// Find where to start arbitration from
- int startIndex = pendingTransactionQueue->indexOf(firstPendingTransaction) + 1;
+ uint 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
return;
}
- for (int i = startIndex; i < pendingTransactionQueue->size(); i++) {
+ for (uint i = startIndex; i < pendingTransactionQueue->size(); i++) {
Transaction *transaction = pendingTransactionQueue->get(i);
lastPendingTransactionSpeculatedOn = transaction;
if (transaction->evaluateGuard(committedKeyValueTable, speculatedKeyValueTable, pendingTransactionSpeculatedKeyValueTable)) {
// Guard evaluated to true so update the speculative table
- for (KeyValue *kv : transaction->getKeyValueUpdateSet()) {
+ SetIterator<KeyValue *, KeyValue *> *kvit = transaction->getKeyValueUpdateSet()->iterator();
+ while (kvit->hasNext()) {
+ KeyValue *kv = kvit->next();
pendingTransactionSpeculatedKeyValueTable->put(kv->getKey(), kv);
}
+ delete kvit;
}
}
}
* 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 transaction;
+ }
}
+ 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();
-
- // Check if the transaction is dead
- int64_t lastTransactionNumber = lastArbitratedTransactionNumberByArbitratorTable->get(status->getTransactionArbitrator());
- if ((lastTransactionNumber != NULL) && (lastTransactionNumber >= status->getTransactionSequenceNumber())) {
-
- // Set committed
- status->setStatus(TransactionStatus_StatusCommitted);
+ {
+ 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
+ if (lastArbitratedTransactionNumberByArbitratorTable->contains(status->getTransactionArbitrator())
+ && (lastArbitratedTransactionNumberByArbitratorTable->get(status->getTransactionArbitrator()) >= status->getTransactionSequenceNumber())) {
+ // Set committed
+ status->setStatus(TransactionStatus_StatusCommitted);
- // Remove
- iter->remove();
+ // Remove
+ iter->remove();
+ }
}
+ delete iter;
}
}
updateLastMessage(slot->getMachineID(), slot->getSequenceNumber(), slot, acceptUpdatesToLocal, machineSet);
// Process each entry in the slot
- for (Entry *entry : slot->getEntries()) {
+ Vector<Entry *> *entries = slot->getEntries();
+ uint eSize = entries->size();
+ for (uint ei = 0; ei < eSize; ei++) {
+ Entry *entry = entries->get(ei);
switch (entry->getType()) {
case TypeCommitPart:
processEntry((CommitPart *)entry);
processEntry((TableStatus *)entry, slot->getSequenceNumber());
break;
default:
- throw new Error("Unrecognized type: " + entry->getType());
+ throw new Error("Unrecognized type: ");
}
}
}
* 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);
// a rejected slot
int64_t slotMachineId = slot->getMachineID();
if (isequal != (slotMachineId == machineId)) {
- throw new Error("Server Error: Trying to insert rejected message for slot " + seqNum);
+ throw new Error("Server Error: Trying to insert rejected message for slot ");
}
}
}
// 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();
+ Pair<int64_t, Liveness *> *lastMessageValue = lastMessageTable->get(lastMessageEntryMachineId);
int64_t entrySequenceNumber = lastMessageValue->getFirst();
if (entrySequenceNumber < seq) {
deviceWatchSet->add(lastMessageEntryMachineId);
}
}
+ delete iter;
+
if (deviceWatchSet->isEmpty()) {
// This rejected message has been seen by all the clients so
entry->setDead();
+ delete deviceWatchSet;
} else {
// We need to watch this rejected message
entry->setWatchSet(deviceWatchSet);
// 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
+ previouslySeenAbort->setDead(); // Delete old version of the abort since we got a rescued newer version
}
if (entry->getTransactionArbitrator() == localMachineId) {
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;
}
// This part is still alive
- Hashtable<Pair<int64_t, int32_t>, TransactionPart *> *transactionPart = newTransactionParts->get(entry->getMachineId());
+ Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals> *transactionPart = newTransactionParts->get(entry->getMachineId());
if (transactionPart == NULL) {
// Dont have a table for this machine Id yet so make one
- transactionPart = new Hashtable<Pair<int64_t, int32_t>, TransactionPart *>();
+ transactionPart = new Hashtable<Pair<int64_t, int32_t> *, TransactionPart *, uintptr_t, 0, pairHashFunction, pairEquals>();
newTransactionParts->put(entry->getMachineId(), transactionPart);
}
// 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
* 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();
+ 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");
if (hadPartialSendToServer) {
// We were not making any updates and we had a machine mismatch
if (lastMessageSeqNum > seqNum && !acceptUpdatesToLocal) {
- throw new Error("Server Error: Mismatch on local machine sequence number, needed at least: " + lastMessageSeqNum + " got: " + seqNum);
+ throw new Error("Server Error: Mismatch on local machine sequence number, needed at least: ");
}
} else {
// We were not making any updates and we had a machine mismatch
if (lastMessageSeqNum != seqNum && !acceptUpdatesToLocal) {
- throw new Error("Server Error: Mismatch on local machine sequence number, needed: " + lastMessageSeqNum + " got: " + seqNum);
+ throw new Error("Server Error: Mismatch on local machine sequence number, needed: ");
}
}
} else {
* Check if the HMAC chain is not violated
*/
void Table::checkHMACChain(SlotIndexer *indexer, Array<Slot *> *newSlots) {
- for (int i = 0; i < newSlots->length(); i++) {
+ for (uint i = 0; i < newSlots->length(); i++) {
Slot *currSlot = newSlots->get(i);
Slot *prevSlot = indexer->getSlot(currSlot->getSequenceNumber() - 1);
if (prevSlot != NULL &&
projects / iotcloud.git / blobdiff