edits

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

diff --git a/version2/src/C/TransactionPart.h b/version2/src/C/TransactionPart.h
index 5110f97aae402336a48582ab10db113d177a5293..4b35977eed92f40f49ee342db248590737f36249 100644 (file)
--- a/version2/src/C/TransactionPart.h
+++ b/version2/src/C/TransactionPart.h
@@ -12,8 +12,8 @@ class TransactionPart extends Entry {
     private int partNumber = -1; // Parts position in the
     private Boolean isLastPart = false;
 
     private int partNumber = -1; // Parts position in the
     private Boolean isLastPart = false;
 

-    private Pair<Long, Long> transactionId = NULL;
-    private Pair<Long, Integer> partId = NULL;
+    private Pair<int64_t, int64_t> transactionId = NULL;
+    private Pair<int64_t int32_t> partId = NULL;

 
     private char[] data = NULL;
 
 
     private char[] data = NULL;
 


@@ -26,8 +26,8 @@ class TransactionPart extends Entry {
         data = _data;
         isLastPart = _isLastPart;
 
         data = _data;
         isLastPart = _isLastPart;
 

-        transactionId = new Pair<Long, Long>(machineId, clientLocalSequenceNumber);
-        partId = new Pair<Long, Integer>(clientLocalSequenceNumber, partNumber);
+        transactionId = new Pair<int64_t, int64_t>(machineId, clientLocalSequenceNumber);
+        partId = new Pair<int64_t int32_t>(clientLocalSequenceNumber, partNumber);

 
     }
 
 
     }
 


@@ -42,7 +42,7 @@ class TransactionPart extends Entry {
         parentslot = s;
     }
 
         parentslot = s;
     }
 

-    public Pair<Long, Long> getTransactionId() {
+    public Pair<int64_t, int64_t> getTransactionId() {

         return transactionId;
     }
 
         return transactionId;
     }
 


@@ -50,7 +50,7 @@ class TransactionPart extends Entry {
         return arbitratorId;
     }
 
         return arbitratorId;
     }
 

-    public Pair<Long, Integer> getPartId() {
+    public Pair<int64_t int32_t> getPartId() {

         return partId;
     }
 
         return partId;
     }
 


@@ -88,16 +88,16 @@ class TransactionPart extends Entry {
     }
 
     static Entry decode(Slot s, ByteBuffer bb) {
     }
 
     static Entry decode(Slot s, ByteBuffer bb) {

-        int64_t sequenceNumber = bb.getLong();
-        int64_t machineId = bb.getLong();
-        int64_t arbitratorId = bb.getLong();
-        int64_t clientLocalSequenceNumber = bb.getLong();
-        int partNumber = bb.getInt();
-        int dataSize = bb.getInt();
-        Boolean isLastPart = (bb.get() == 1);
+        int64_t sequenceNumber = bb->getLong();
+        int64_t machineId = bb->getLong();
+        int64_t arbitratorId = bb->getLong();
+        int64_t clientLocalSequenceNumber = bb->getLong();
+        int partNumber = bb->getInt();
+        int dataSize = bb->getInt();
+        Boolean isLastPart = (bb->get() == 1);

         // Get the data
         char[] data = new char[dataSize];
         // Get the data
         char[] data = new char[dataSize];

-        bb.get(data);
+        bb->get(data);

 
         TransactionPart returnTransactionPart = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
         returnTransactionPart.setSequenceNumber(sequenceNumber);
 
         TransactionPart returnTransactionPart = new TransactionPart(s, machineId, arbitratorId, clientLocalSequenceNumber, partNumber, data, isLastPart);
         returnTransactionPart.setSequenceNumber(sequenceNumber);


@@ -106,21 +106,21 @@ class TransactionPart extends Entry {
     }
 
     public void encode(ByteBuffer bb) {
     }
 
     public void encode(ByteBuffer bb) {

-        bb.put(Entry.TypeTransactionPart);
-        bb.putLong(sequenceNumber);
-        bb.putLong(machineId);
-        bb.putLong(arbitratorId);
-        bb.putLong(clientLocalSequenceNumber);
-        bb.putInt(partNumber);
-        bb.putInt(data.length);
+        bb->put(Entry.TypeTransactionPart);
+        bb->putLong(sequenceNumber);
+        bb->putLong(machineId);
+        bb->putLong(arbitratorId);
+        bb->putLong(clientLocalSequenceNumber);
+        bb->putInt(partNumber);
+        bb->putInt(data.length);

 
         if (isLastPart) {
 
         if (isLastPart) {

-            bb.put((char)1);
+            bb->put((char)1);

         } else {
         } else {

-            bb.put((char)0);
+            bb->put((char)0);

         }
 
         }
 

-        bb.put(data);
+        bb->put(data);

     }
 
     public char getType() {
     }
 
     public char getType() {