refact: adjust head file and sync log

source/libs/sync/inc/syncRaftCfg.h

@@ -22,11 +22,9 @@ extern "C" {
 
 #include "syncInt.h"
 
-#define CONFIG_FILE_LEN 2048
-
+#define CONFIG_FILE_LEN        2048
 #define MAX_CONFIG_INDEX_COUNT 256
 
-// SRaftCfgIndex ------------------------------------------
 typedef struct SRaftCfgIndex {
   TdFilePtr pFile;
   char      path[TSDB_FILENAME_LEN * 2];
@@ -44,11 +42,8 @@ cJSON  *raftCfgIndex2Json(SRaftCfgIndex *pRaftCfgIndex);
 char   *raftCfgIndex2Str(SRaftCfgIndex *pRaftCfgIndex);
 int32_t raftCfgIndexFromJson(const cJSON *pRoot, SRaftCfgIndex *pRaftCfgIndex);
 int32_t raftCfgIndexFromStr(const char *s, SRaftCfgIndex *pRaftCfgIndex);
-
 int32_t raftCfgIndexCreateFile(const char *path);
 
-// ---------------------------------------------------------
-
 typedef struct SRaftCfg {
   SSyncCfg  cfg;
   TdFilePtr pFile;
@@ -68,11 +63,9 @@ int32_t   raftCfgClose(SRaftCfg *pRaftCfg);
 int32_t   raftCfgPersist(SRaftCfg *pRaftCfg);
 int32_t   raftCfgAddConfigIndex(SRaftCfg *pRaftCfg, SyncIndex configIndex);
 
-cJSON  *syncCfg2Json(SSyncCfg *pSyncCfg);
-char   *syncCfg2Str(SSyncCfg *pSyncCfg);
 void    syncCfg2SimpleStr(const SSyncCfg *pCfg, char *str, int32_t bufLen);
+cJSON  *syncCfg2Json(SSyncCfg *pSyncCfg);
 int32_t syncCfgFromJson(const cJSON *pRoot, SSyncCfg *pSyncCfg);
-int32_t syncCfgFromStr(const char *s, SSyncCfg *pSyncCfg);
 
 cJSON  *raftCfg2Json(SRaftCfg *pRaftCfg);
 char   *raftCfg2Str(SRaftCfg *pRaftCfg);

source/libs/sync/src/syncRaftCfg.c

@@ -13,10 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define _DEFAULT_SOURCE
 #include "syncRaftCfg.h"
-#include "cJSON.h"
-#include "syncEnv.h"
-#include "syncUtil.h"
 
 // file must already exist!
 SRaftCfgIndex *raftCfgIndexOpen(const char *path) {
@@ -242,13 +240,6 @@ cJSON *syncCfg2Json(SSyncCfg *pSyncCfg) {
   return pRoot;
 }
 
-char *syncCfg2Str(SSyncCfg *pSyncCfg) {
-  cJSON *pJson = syncCfg2Json(pSyncCfg);
-  char  *serialized = cJSON_Print(pJson);
-  cJSON_Delete(pJson);
-  return serialized;
-}
-
 int32_t syncCfgFromJson(const cJSON *pRoot, SSyncCfg *pSyncCfg) {
   memset(pSyncCfg, 0, sizeof(SSyncCfg));
   // cJSON *pJson = cJSON_GetObjectItem(pRoot, "SSyncCfg");
@@ -283,17 +274,6 @@ int32_t syncCfgFromJson(const cJSON *pRoot, SSyncCfg *pSyncCfg) {
   return 0;
 }
 
-int32_t syncCfgFromStr(const char *s, SSyncCfg *pSyncCfg) {
-  cJSON *pRoot = cJSON_Parse(s);
-  ASSERT(pRoot != NULL);
-
-  int32_t ret = syncCfgFromJson(pRoot, pSyncCfg);
-  ASSERT(ret == 0);
-
-  cJSON_Delete(pRoot);
-  return 0;
-}
-
 cJSON *raftCfg2Json(SRaftCfg *pRaftCfg) {
   cJSON *pRoot = cJSON_CreateObject();
   cJSON_AddItemToObject(pRoot, "SSyncCfg", syncCfg2Json(&(pRaftCfg->cfg)));

source/libs/sync/src/syncRaftEntry.c

@@ -102,7 +102,6 @@ void syncEntry2OriginalRpc(const SSyncRaftEntry* pEntry, SRpcMsg* pRpcMsg) {
   memcpy(pRpcMsg->pCont, pEntry->data, pRpcMsg->contLen);
 }
 
-//-----------------------------------
 SRaftEntryHashCache* raftCacheCreate(SSyncNode* pSyncNode, int32_t maxCount) {
   SRaftEntryHashCache* pCache = taosMemoryMalloc(sizeof(SRaftEntryHashCache));
   if (pCache == NULL) {
@@ -256,8 +255,6 @@ int32_t raftCacheClear(struct SRaftEntryHashCache* pCache) {
   return 0;
 }
 
-
-//-----------------------------------
 static char* keyFn(const void* pData) {
   SSyncRaftEntry* pEntry = (SSyncRaftEntry*)pData;
   return (char*)(&(pEntry->index));

source/libs/sync/test/syncConfigChangeSnapshotTest.cpp

@@ -143,7 +143,8 @@ int32_t SnapshotDoWrite(struct SSyncFSM* pFsm, void* pWriter, void* pBuf, int32_
 void RestoreFinishCb(struct SSyncFSM* pFsm) { sTrace("==callback== ==RestoreFinishCb=="); }
 
 void ReConfigCb(struct SSyncFSM* pFsm, const SRpcMsg* pMsg, SReConfigCbMeta* cbMeta) {
-  sTrace("==callback== ==ReConfigCb== flag:0x%lX, index:%" PRId64 ", code:%d, currentTerm:%" PRIu64 ", term:%" PRIu64,
+  sTrace("==callback== ==ReConfigCb== flag:0x%" PRIx64 ", index:%" PRId64 ", code:%d, currentTerm:%" PRIu64
+         ", term:%" PRIu64,
          cbMeta->flag, cbMeta->index, cbMeta->code, cbMeta->currentTerm, cbMeta->term);
 }
 

source/libs/sync/test/syncConfigChangeTest.cpp

@@ -73,7 +73,8 @@ int32_t GetSnapshotCb(const struct SSyncFSM* pFsm, SSnapshot* pSnapshot) {
 void RestoreFinishCb(struct SSyncFSM* pFsm) { sTrace("==callback== ==RestoreFinishCb=="); }
 
 void ReConfigCb(struct SSyncFSM* pFsm, const SRpcMsg* pMsg, SReConfigCbMeta* cbMeta) {
-  sTrace("==callback== ==ReConfigCb== flag:0x%lX, index:%" PRId64 ", code:%d, currentTerm:%" PRIu64 ", term:%" PRIu64,
+  sTrace("==callback== ==ReConfigCb== flag:%" PRIx64 ", index:%" PRId64 ", code:%d, currentTerm:%" PRIu64
+         ", term:%" PRIu64,
          cbMeta->flag, cbMeta->index, cbMeta->code, cbMeta->currentTerm, cbMeta->term);
 }
 

source/libs/sync/test/syncTestTool.cpp

@@ -148,8 +148,8 @@ void RestoreFinishCb(struct SSyncFSM* pFsm) { sTrace("==callback== ==RestoreFini
 
 void ReConfigCb(struct SSyncFSM* pFsm, const SRpcMsg* pMsg, SReConfigCbMeta* cbMeta) {
   char* s = syncCfg2Str(&(cbMeta->newCfg));
-  sTrace("==callback== ==ReConfigCb== flag:0x%lX, index:%" PRId64 ", code:%d, currentTerm:%" PRIu64 ", term:%" PRIu64
-         ", newCfg:%s",
+  sTrace("==callback== ==ReConfigCb== flag:%" PRIx64 ", index:%" PRId64 ", code:%d, currentTerm:%" PRIu64
+         ", term:%" PRIu64 ", newCfg:%s",
          cbMeta->flag, cbMeta->index, cbMeta->code, cbMeta->currentTerm, cbMeta->term, s);
   taosMemoryFree(s);
 }

source/libs/sync/test/sync_test_lib/inc/syncTest.h

@@ -49,6 +49,9 @@ void   syncEntryPrint2(char* s, const SSyncRaftEntry* pObj);
 void   syncEntryLog(const SSyncRaftEntry* pObj);
 void   syncEntryLog2(char* s, const SSyncRaftEntry* pObj);
 
+char*   syncCfg2Str(SSyncCfg* pSyncCfg);
+int32_t syncCfgFromStr(const char* s, SSyncCfg* pSyncCfg);
+
 cJSON* raftCache2Json(SRaftEntryHashCache* pObj);
 char*  raftCache2Str(SRaftEntryHashCache* pObj);
 void   raftCachePrint(SRaftEntryHashCache* pObj);

source/libs/sync/test/sync_test_lib/src/syncRaftCfgDebug.c

@@ -16,4 +16,20 @@
 #define _DEFAULT_SOURCE
 #include "syncTest.h"
 
+char *syncCfg2Str(SSyncCfg *pSyncCfg) {
+  cJSON *pJson = syncCfg2Json(pSyncCfg);
+  char  *serialized = cJSON_Print(pJson);
+  cJSON_Delete(pJson);
+  return serialized;
+}
 
+int32_t syncCfgFromStr(const char *s, SSyncCfg *pSyncCfg) {
+  cJSON *pRoot = cJSON_Parse(s);
+  ASSERT(pRoot != NULL);
+
+  int32_t ret = syncCfgFromJson(pRoot, pSyncCfg);
+  ASSERT(ret == 0);
+
+  cJSON_Delete(pRoot);
+  return 0;
+}