From 7852188394c43326cee9bd05ae9d81a00c3c1e3b Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Tue, 7 Jun 2022 16:49:07 +0800
Subject: [PATCH] enh(sync): add privateTerm into SSyncSnapshotSender,
 SyncAppendEntries, SyncAppendEntriesReply

---
 include/libs/sync/syncTools.h                        | 2 ++
 source/libs/sync/inc/syncSnapshot.h                  | 1 +
 source/libs/sync/src/syncMessage.c                   | 6 ++++++
 source/libs/sync/src/syncSnapshot.c                  | 2 ++
 source/libs/sync/test/syncAppendEntriesReplyTest.cpp | 2 ++
 source/libs/sync/test/syncAppendEntriesTest.cpp      | 1 +
 source/libs/sync/test/syncSnapshotSenderTest.cpp     | 2 ++
 7 files changed, 16 insertions(+)

diff --git a/include/libs/sync/syncTools.h b/include/libs/sync/syncTools.h
index 21ce75c28e..9176d7b317 100644
--- a/include/libs/sync/syncTools.h
+++ b/include/libs/sync/syncTools.h
@@ -301,6 +301,7 @@ typedef struct SyncAppendEntries {
   SyncIndex prevLogIndex;
   SyncTerm  prevLogTerm;
   SyncIndex commitIndex;
+  SyncTerm  privateTerm;
   uint32_t  dataLen;
   char      data[];
 } SyncAppendEntries;
@@ -332,6 +333,7 @@ typedef struct SyncAppendEntriesReply {
   SRaftId  destId;
   // private data
   SyncTerm  term;
+  SyncTerm  privateTerm;
   bool      success;
   SyncIndex matchIndex;
 } SyncAppendEntriesReply;
diff --git a/source/libs/sync/inc/syncSnapshot.h b/source/libs/sync/inc/syncSnapshot.h
index f9f890aa8a..a297217b74 100644
--- a/source/libs/sync/inc/syncSnapshot.h
+++ b/source/libs/sync/inc/syncSnapshot.h
@@ -47,6 +47,7 @@ typedef struct SSyncSnapshotSender {
   SSyncNode *pSyncNode;
   int32_t    replicaIndex;
   SyncTerm   term;
+  SyncTerm   privateTerm;
   bool       finish;
 } SSyncSnapshotSender;
 
diff --git a/source/libs/sync/src/syncMessage.c b/source/libs/sync/src/syncMessage.c
index e8fa146271..126229af42 100644
--- a/source/libs/sync/src/syncMessage.c
+++ b/source/libs/sync/src/syncMessage.c
@@ -1343,6 +1343,9 @@ cJSON* syncAppendEntries2Json(const SyncAppendEntries* pMsg) {
     snprintf(u64buf, sizeof(u64buf), "%lu", pMsg->term);
     cJSON_AddStringToObject(pRoot, "term", u64buf);
 
+    snprintf(u64buf, sizeof(u64buf), "%lu", pMsg->privateTerm);
+    cJSON_AddStringToObject(pRoot, "privateTerm", u64buf);
+
     snprintf(u64buf, sizeof(u64buf), "%ld", pMsg->prevLogIndex);
     cJSON_AddStringToObject(pRoot, "prevLogIndex", u64buf);
 
@@ -1504,6 +1507,9 @@ cJSON* syncAppendEntriesReply2Json(const SyncAppendEntriesReply* pMsg) {
     cJSON_AddNumberToObject(pDestId, "vgId", pMsg->destId.vgId);
     cJSON_AddItemToObject(pRoot, "destId", pDestId);
 
+    snprintf(u64buf, sizeof(u64buf), "%lu", pMsg->privateTerm);
+    cJSON_AddStringToObject(pRoot, "privateTerm", u64buf);
+
     snprintf(u64buf, sizeof(u64buf), "%lu", pMsg->term);
     cJSON_AddStringToObject(pRoot, "term", u64buf);
     cJSON_AddNumberToObject(pRoot, "success", pMsg->success);
diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index 4df955083b..36d9225b30 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -275,6 +275,8 @@ cJSON *snapshotSender2Json(SSyncSnapshotSender *pSender) {
     cJSON_AddNumberToObject(pRoot, "replicaIndex", pSender->replicaIndex);
     snprintf(u64buf, sizeof(u64buf), "%lu", pSender->term);
     cJSON_AddStringToObject(pRoot, "term", u64buf);
+    snprintf(u64buf, sizeof(u64buf), "%lu", pSender->privateTerm);
+    cJSON_AddStringToObject(pRoot, "privateTerm", u64buf);
     cJSON_AddNumberToObject(pRoot, "finish", pSender->finish);
   }
 
diff --git a/source/libs/sync/test/syncAppendEntriesReplyTest.cpp b/source/libs/sync/test/syncAppendEntriesReplyTest.cpp
index a90259bc3a..d41e99a3cd 100644
--- a/source/libs/sync/test/syncAppendEntriesReplyTest.cpp
+++ b/source/libs/sync/test/syncAppendEntriesReplyTest.cpp
@@ -22,6 +22,8 @@ SyncAppendEntriesReply *createMsg() {
   pMsg->destId.vgId = 100;
   pMsg->success = true;
   pMsg->matchIndex = 77;
+  pMsg->term = 33;
+  pMsg->privateTerm = 44;
   return pMsg;
 }
 
diff --git a/source/libs/sync/test/syncAppendEntriesTest.cpp b/source/libs/sync/test/syncAppendEntriesTest.cpp
index bb9f306a1c..98b392274e 100644
--- a/source/libs/sync/test/syncAppendEntriesTest.cpp
+++ b/source/libs/sync/test/syncAppendEntriesTest.cpp
@@ -23,6 +23,7 @@ SyncAppendEntries *createMsg() {
   pMsg->prevLogIndex = 11;
   pMsg->prevLogTerm = 22;
   pMsg->commitIndex = 33;
+  pMsg->privateTerm = 44;
   strcpy(pMsg->data, "hello world");
   return pMsg;
 }
diff --git a/source/libs/sync/test/syncSnapshotSenderTest.cpp b/source/libs/sync/test/syncSnapshotSenderTest.cpp
index 76d021004f..404ba2acae 100644
--- a/source/libs/sync/test/syncSnapshotSenderTest.cpp
+++ b/source/libs/sync/test/syncSnapshotSenderTest.cpp
@@ -40,6 +40,7 @@ SSyncSnapshotSender* createSender() {
   pSyncNode->pFsm->FpSnapshotStartRead = SnapshotStartRead;
   pSyncNode->pFsm->FpSnapshotStopRead = SnapshotStopRead;
   pSyncNode->pFsm->FpSnapshotDoRead = SnapshotDoRead;
+  pSyncNode->pFsm->FpGetSnapshot = GetSnapshot;
 
   SSyncSnapshotSender* pSender = snapshotSenderCreate(pSyncNode, 2);
   pSender->start = true;
@@ -54,6 +55,7 @@ SSyncSnapshotSender* createSender() {
   pSender->snapshot.lastApplyTerm = 88;
   pSender->sendingMS = 77;
   pSender->term = 66;
+  pSender->privateTerm = 99;
 
   return pSender;
 }