Edits

[iotcloud.git] / version2 / src / C / Commit.cc

diff --git a/version2/src/C/Commit.cc b/version2/src/C/Commit.cc
index fb09a94d9590f5e70e639c748c55ad73cc6c2051..ec4b39aefdf2885c275224e1ea66e8cb0c335734 100644 (file)
--- a/version2/src/C/Commit.cc
+++ b/version2/src/C/Commit.cc
@@ -39,9 +39,9 @@ void Commit::addPartDecode(CommitPart *newPart) {
        }
 
        CommitPart *previouslySeenPart = parts->setExpand(newPart->getPartNumber(), newPart);
-       if(previouslySeenPart == NULL)
+       if (previouslySeenPart == NULL)
                partCount++;
-       
+
        if (previouslySeenPart != NULL) {
                // Set dead the old one since the new one is a rescued version of this part
                previouslySeenPart->setDead();
@@ -115,9 +115,9 @@ void Commit::setDead() {
        if (!isDead) {
                isDead = true;
                // Make all the parts of this transaction dead
-               for (int32_t partNumber = 0; partNumber < parts->size(); partNumber ++) {
+               for (int32_t partNumber = 0; partNumber < parts->size(); partNumber++) {
                        CommitPart *part = parts->get(partNumber);
-                       if (parts!=NULL)
+                       if (parts != NULL)
                                part->setDead();
                }
        }
@@ -150,7 +150,7 @@ void Commit::createCommitParts() {
                Array<char> *partData = new Array<char>(copySize);
                System_arraycopy(charData, currentPosition, partData, 0, copySize);
 
-               CommitPart* part = new CommitPart(NULL, machineId, sequenceNumber, transactionSequenceNumber, commitPartCount, partData, isLastPart);
+               CommitPart *part = new CommitPart(NULL, machineId, sequenceNumber, transactionSequenceNumber, commitPartCount, partData, isLastPart);
                parts->setExpand(part->getPartNumber(), part);
 
                // Update position, count and remaining
@@ -165,7 +165,7 @@ void Commit::decodeCommitData() {
        int dataSize = 0;
        for (int i = 0; i < parts->size(); i++) {
                CommitPart *tp = parts->get(i);
-               if (tp!=NULL)
+               if (tp != NULL)
                        dataSize += tp->getDataSize();
        }
 
@@ -175,7 +175,7 @@ void Commit::decodeCommitData() {
        // Stitch all the data sections together
        for (int i = 0; i < parts->size(); i++) {
                CommitPart *tp = parts->get(i);
-               if (tp!=NULL) {
+               if (tp != NULL) {
                        System_arraycopy(tp->getData(), 0, combinedData, currentPosition, tp->getDataSize());
                        currentPosition += tp->getDataSize();
                }
@@ -198,13 +198,13 @@ void Commit::decodeCommitData() {
 Array<char> *Commit::convertDataToBytes() {
        // Calculate the size of the data
        int sizeOfData = sizeof(int32_t);       // Number of Update KV's
-       SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> * kvit = keyValueUpdateSet->iterator();
-       while(kvit->hasNext()) {
-               KeyValue * kv = kvit->next();
+       SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = keyValueUpdateSet->iterator();
+       while (kvit->hasNext()) {
+               KeyValue *kv = kvit->next();
                sizeOfData += kv->getSize();
        }
        delete kvit;
-       
+
        // Data handlers and storage
        Array<char> *dataArray = new Array<char>(sizeOfData);
        ByteBuffer *bbEncode = ByteBuffer_wrap(dataArray);
@@ -214,12 +214,12 @@ Array<char> *Commit::convertDataToBytes() {
 
        // Encode all the updates
        kvit = keyValueUpdateSet->iterator();
-       while(kvit->hasNext()) {
-               KeyValue * kv = kvit->next();
+       while (kvit->hasNext()) {
+               KeyValue *kv = kvit->next();
                kv->encode(bbEncode);
        }
        delete kvit;
-       
+
        return bbEncode->array();
 }
 
@@ -227,8 +227,8 @@ void Commit::setKVsMap(Hashset<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKey
        keyValueUpdateSet->clear();
        keyValueUpdateSet->addAll(newKVs);
        liveKeys->clear();
-       SetIterator<KeyValue*, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = newKVs->iterator();
-       while(kvit->hasNext()) {
+       SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = newKVs->iterator();
+       while (kvit->hasNext()) {
                liveKeys->add(kvit->next()->getKey());
        }
        delete kvit;
@@ -242,18 +242,18 @@ Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber) {
        }
        Hashset<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvSet = new Hashset<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue>();
        SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = older->getKeyValueUpdateSet()->iterator();
-       while(kvit->hasNext()) {
-               KeyValue* kv=kvit->next();
+       while (kvit->hasNext()) {
+               KeyValue *kv = kvit->next();
                kvSet->add(kv);
        }
        delete kvit;
        kvit = newer->getKeyValueUpdateSet()->iterator();
-       while(kvit->hasNext()) {
-               KeyValue* kv=kvit->next();
+       while (kvit->hasNext()) {
+               KeyValue *kv = kvit->next();
                kvSet->add(kv);
        }
        delete kvit;
-       
+
        int64_t transactionSequenceNumber = newer->getTransactionSequenceNumber();
        if (transactionSequenceNumber == -1) {
                transactionSequenceNumber = older->getTransactionSequenceNumber();