edits

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

diff --git a/version2/src/C/Commit.h b/version2/src/C/Commit.h
index 752293cf2c83fb52b3c467864510b2518d4717b6..4de3d22e478db8614da689f70ca89aa449841fc2 100644 (file)
--- a/version2/src/C/Commit.h
+++ b/version2/src/C/Commit.h
@@ -4,8 +4,8 @@
 
 class Commit {
 private:
-       Hashtable<int32_t, CommitPart *, int32_t> *parts;
-       Hashset<int32_t, int32_t> *missingParts;
+       Hashtable<int32_t, CommitPart *> *parts;
+       Hashset<int32_t> *missingParts;
        bool fldisComplete;
        bool hasLastPart;
        Hashset<KeyValue *> *keyValueUpdateSet;
@@ -20,11 +20,10 @@ private:
 public:
        Commit();
        Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber);
-
        void addPartDecode(CommitPart *newPart);
        int64_t getSequenceNumber();
        int64_t getTransactionSequenceNumber();
-       Hashtable<int32_t, CommitPart *, int32_t> *getParts();
+       Hashtable<int32_t, CommitPart *> *getParts();
        void addKV(KeyValue *kv);
        void invalidateKey(IoTString *key);
        Hashset<KeyValue *> *getKeyValueUpdateSet();
@@ -36,6 +35,7 @@ public:
        CommitPart *getPart(int32_t index);
        void createCommitParts();
        void decodeCommitData();
+       friend Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber);
 };
 
 Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber);