refact: remove assert and adjust log

source/libs/sync/src/syncVoteMgr.c

@@ -62,7 +62,7 @@ bool voteGrantedMajority(SVotesGranted *pVotesGranted) { return pVotesGranted->v
 
 void voteGrantedVote(SVotesGranted *pVotesGranted, SyncRequestVoteReply *pMsg) {
   if (!pMsg->voteGranted) {
-    sNFatal(pVotesGranted->pSyncNode, " vote granted should be true");
+    sNFatal(pVotesGranted->pSyncNode, "vote granted should be true");
     return;
   }
 
@@ -73,7 +73,7 @@ void voteGrantedVote(SVotesGranted *pVotesGranted, SyncRequestVoteReply *pMsg) {
   }
 
   if (!syncUtilSameId(&pVotesGranted->pSyncNode->myRaftId, &pMsg->destId)) {
-    sNFatal(pVotesGranted->pSyncNode, " vote granted raftId not matched with msg");
+    sNFatal(pVotesGranted->pSyncNode, "vote granted raftId not matched with msg");
     return;
   }
 
@@ -84,8 +84,8 @@ void voteGrantedVote(SVotesGranted *pVotesGranted, SyncRequestVoteReply *pMsg) {
       break;
     }
   }
-  if ((j == -1) || (j >= 0 && j < pVotesGranted->replicaNum)) {
+  if ((j == -1) || !(j >= 0 && j < pVotesGranted->replicaNum)) {
-    sNFatal(pVotesGranted->pSyncNode, " invalid msg srcId, index:%d", j);
+    sNFatal(pVotesGranted->pSyncNode, "invalid msg srcId, index:%d", j);
     return;
   }
 
@@ -94,8 +94,8 @@ void voteGrantedVote(SVotesGranted *pVotesGranted, SyncRequestVoteReply *pMsg) {
     pVotesGranted->isGranted[j] = true;
   }
 
-  if (pVotesGranted->votes <= pVotesGranted->replicaNum) {
+  if (pVotesGranted->votes > pVotesGranted->replicaNum) {
-    sNFatal(pVotesGranted->pSyncNode, " votes:%d not matched with replicaNum:%d", pVotesGranted->votes,
+    sNFatal(pVotesGranted->pSyncNode, "votes:%d not matched with replicaNum:%d", pVotesGranted->votes,
             pVotesGranted->replicaNum);
     return;
   }

source/libs/sync/test/syncAppendEntriesBatchTest.cpp

@@ -1,11 +1,4 @@
 //#include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncRaftEntry.h"
-#include "syncUtil.h"
-#include "trpc.h"
 #include "syncTest.h"
 
 void logTest() {

source/libs/sync/test/syncAppendEntriesReplyTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncAppendEntriesTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncApplyMsgTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncConfigChangeSnapshotTest.cpp

@@ -1,11 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "os.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncConfigChangeTest.cpp

@@ -1,11 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "os.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncElectTest.cpp

@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncEncodeTest.cpp

@@ -1,15 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncRaftEntry.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
 #include "syncTest.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 #if 0
 void logTest() {

source/libs/sync/test/syncEnqTest.cpp

@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncEntryCacheTest.cpp

@@ -1,12 +1,3 @@
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "tref.h"
-#include "tskiplist.h"
 #include "syncTest.h"
 
 void logTest() {

source/libs/sync/test/syncEntryTest.cpp

@@ -1,11 +1,3 @@
-#include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 #include "syncTest.h"
 
 void logTest() {

source/libs/sync/test/syncEnvTest.cpp

@@ -1,9 +1,4 @@
-#include "syncEnv.h"
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "ttime.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncHashCacheTest.cpp

@@ -1,12 +1,4 @@
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
 #include "syncTest.h"
-#include "syncUtil.h"
-#include "tskiplist.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncHeartbeatReplyTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncHeartbeatTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncIOClientTest.cpp

@@ -1,10 +1,4 @@
-#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
-#include "tdatablock.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncIOSendMsgTest.cpp

@@ -1,10 +1,4 @@
-#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");
@@ -101,7 +95,7 @@ int main(int argc, char** argv) {
     syncPingReply2RpcMsg(pSyncMsg, &rpcMsg);
 
     SEpSet epSet;
-    syncUtilnodeInfo2EpSet(&pSyncNode->myNodeInfo, &epSet);
+    syncUtilNodeInfo2EpSet(&pSyncNode->myNodeInfo, &epSet);
     rpcMsg.info.noResp = 1;
     pSyncNode->syncSendMSg(&epSet, &rpcMsg);
 

source/libs/sync/test/syncIOServerTest.cpp

@@ -1,8 +1,4 @@
-#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncIOTickPingTest.cpp

@@ -1,8 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncIOTickQTest.cpp

@@ -1,8 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncIndexMgrTest.cpp

@@ -1,12 +1,4 @@
-#include "syncIndexMgr.h"
+#include "syncTest.h"
-//#include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "syncVoteMgr.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncIndexTest.cpp

@@ -1,8 +1,4 @@
-#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
 
 void print(SHashObj *pNextIndex) {
   printf("----------------\n");

source/libs/sync/test/syncInitTest.cpp

@@ -1,10 +1,4 @@
-#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncLeaderTransferTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncLocalCmdTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncLogStoreCheck.cpp

@@ -1,13 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
 #include "syncTest.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncLogStoreCheck2.cpp

@@ -1,12 +1,4 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "wal.h"
 #include "syncTest.h"
 
 void logTest() {

source/libs/sync/test/syncLogStoreTest.cpp

@@ -1,13 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
 #include "syncTest.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPingReplyTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPingSelfTest.cpp

@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPingTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPingTimerTest.cpp

@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPingTimerTest2.cpp

@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPreSnapshotReplyTest.cpp

@@ -1,10 +1,6 @@
 
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncPreSnapshotTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRaftCfgIndexTest.cpp

@@ -1,10 +1,5 @@
 #include "syncRaftStore.h"
-//#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftCfg.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRaftCfgTest.cpp

@@ -1,10 +1,4 @@
-#include "syncRaftStore.h"
+#include "syncTest.h"
-//#include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftCfg.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRaftIdCheck.cpp

@@ -1,8 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncUtil.h"
 
 void usage(char* exe) {
   printf("Usage: %s host port \n", exe);

source/libs/sync/test/syncRaftLogTest.cpp

@@ -1,12 +1,5 @@
 #include "syncRaftLog.h"
-//#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRaftLogTest2.cpp

@@ -1,13 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
 #include "syncTest.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRaftStoreTest.cpp

@@ -1,9 +1,5 @@
 #include "syncRaftStore.h"
-//#include <gtest/gtest.h>
+#include "syncTest.h"
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRefTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "tref.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncReplicateTest.cpp

@@ -1,10 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRequestVoteReplyTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRequestVoteTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRestoreFromSnapshot.cpp

@@ -1,12 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncRpcMsgTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncSnapshotReceiverTest.cpp

@@ -1,11 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncRaftStore.h"
-#include "syncSnapshot.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncSnapshotRspTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncSnapshotSendTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncSnapshotSenderTest.cpp

@@ -1,11 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncRaftStore.h"
-#include "syncSnapshot.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncSnapshotTest.cpp

@@ -1,14 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncRaftEntry.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncTest.cpp

@@ -1,7 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
 
 /*
 typedef enum {

source/libs/sync/test/syncTestTool.cpp

@@ -1,12 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "os.h"
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftCfg.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncTimeoutTest.cpp

@@ -1,9 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
+#include "syncTest.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncUtil.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncUtilTest.cpp

@@ -1,9 +1,4 @@
-#include "syncUtil.h"
+#include "syncTest.h"
-//#include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

source/libs/sync/test/syncVotesGrantedTest.cpp

@@ -1,11 +1,3 @@
-#include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "syncVoteMgr.h"
 #include "syncTest.h"
 
 void logTest() {

source/libs/sync/test/syncVotesRespondTest.cpp

@@ -1,14 +1,6 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncRaftStore.h"
-#include "syncUtil.h"
-#include "syncVoteMgr.h"
 #include "syncTest.h"
 
-
 void logTest() {
   sTrace("--- sync log test: trace");
   sDebug("--- sync log test: debug");

source/libs/sync/test/syncWriteTest.cpp

@@ -1,15 +1,5 @@
 #include <gtest/gtest.h>
-#include <stdio.h>
-#include "syncEnv.h"
-#include "syncIO.h"
-#include "syncInt.h"
-#include "syncMessage.h"
-#include "syncRaftEntry.h"
-#include "syncRaftLog.h"
-#include "syncRaftStore.h"
 #include "syncTest.h"
-#include "syncUtil.h"
-#include "wal.h"
 
 void logTest() {
   sTrace("--- sync log test: trace");

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

@@ -22,8 +22,10 @@ extern "C" {
 
 #include "syncInt.h"
 
+#include "tref.h"
 #include "wal.h"
 
+#include "tref.h"
 #include "syncEnv.h"
 #include "syncIO.h"
 #include "syncIndexMgr.h"
@@ -38,6 +40,8 @@ extern "C" {
 #include "syncUtil.h"
 #include "syncVoteMgr.h"
 
+extern void addEpIntoEpSet(SEpSet* pEpSet, const char* fqdn, uint16_t port);
+
 cJSON* syncEntry2Json(const SSyncRaftEntry* pEntry);
 char*  syncEntry2Str(const SSyncRaftEntry* pEntry);
 void   syncEntryPrint(const SSyncRaftEntry* pObj);