From 03b88ff41cba1c13a6fc0417447c9eaa9ab2f841 Mon Sep 17 00:00:00 2001 From: Benguang Zhao Date: Fri, 18 Nov 2022 09:50:36 +0800 Subject: [PATCH] enh: rename syncLogBuffer.h|c to syncPipeline.h|c --- .../libs/sync/inc/{syncLogBuffer.h => syncPipeline.h} | 11 +++-------- source/libs/sync/src/syncAppendEntries.c | 3 ++- source/libs/sync/src/syncAppendEntriesReply.c | 2 +- source/libs/sync/src/syncMain.c | 2 +- .../libs/sync/src/{syncLogBuffer.c => syncPipeline.c} | 2 +- source/libs/sync/src/syncReplication.c | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) rename source/libs/sync/inc/{syncLogBuffer.h => syncPipeline.h} (93%) rename source/libs/sync/src/{syncLogBuffer.c => syncPipeline.c} (99%) diff --git a/source/libs/sync/inc/syncLogBuffer.h b/source/libs/sync/inc/syncPipeline.h similarity index 93% rename from source/libs/sync/inc/syncLogBuffer.h rename to source/libs/sync/inc/syncPipeline.h index 39b4439d62..666515078a 100644 --- a/source/libs/sync/inc/syncLogBuffer.h +++ b/source/libs/sync/inc/syncPipeline.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#ifndef _TD_LIBS_SYNC_LOG_BUFFER_H -#define _TD_LIBS_SYNC_LOG_BUFFER_H +#ifndef _TD_LIBS_SYNC_PIPELINE_H +#define _TD_LIBS_SYNC_PIPELINE_H #ifdef __cplusplus extern "C" { @@ -58,7 +58,6 @@ typedef struct SSyncLogBuffer { } SSyncLogBuffer; // SSyncLogRepMgr - SSyncLogReplMgr* syncLogReplMgrCreate(); void syncLogReplMgrDestroy(SSyncLogReplMgr* pMgr); int32_t syncLogReplMgrReset(SSyncLogReplMgr* pMgr); @@ -113,12 +112,8 @@ int32_t syncLogBufferValidate(SSyncLogBuffer* pBuf); int32_t syncLogBufferRollback(SSyncLogBuffer* pBuf, SyncIndex toIndex); int32_t syncLogBufferReplicate(SSyncLogBuffer* pBuf, SSyncNode* pNode, SSyncRaftEntry* pEntry, SyncTerm prevLogTerm); -// others -int64_t syncNodeUpdateCommitIndex(SSyncNode* ths, SyncIndex commtIndex); -int32_t syncLogToAppendEntries(SSyncNode* pNode, SSyncRaftEntry* pEntry, SyncTerm prevLogTerm, SRpcMsg* pRpcMsg); - #ifdef __cplusplus } #endif -#endif /*_TD_LIBS_SYNC_LOG_BUFFER_H*/ +#endif /*_TD_LIBS_SYNC_PIPELINE_H*/ diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c index 4eff19ced8..f2bdf6be70 100644 --- a/source/libs/sync/src/syncAppendEntries.c +++ b/source/libs/sync/src/syncAppendEntries.c @@ -15,12 +15,13 @@ #define _DEFAULT_SOURCE #include "syncAppendEntries.h" -#include "syncLogBuffer.h" +#include "syncPipeline.h" #include "syncMessage.h" #include "syncRaftLog.h" #include "syncRaftStore.h" #include "syncReplication.h" #include "syncUtil.h" +#include "syncCommit.h" // TLA+ Spec // HandleAppendEntriesRequest(i, j, m) == diff --git a/source/libs/sync/src/syncAppendEntriesReply.c b/source/libs/sync/src/syncAppendEntriesReply.c index 234e8bffeb..ad388e193a 100644 --- a/source/libs/sync/src/syncAppendEntriesReply.c +++ b/source/libs/sync/src/syncAppendEntriesReply.c @@ -17,7 +17,7 @@ #include "syncAppendEntriesReply.h" #include "syncCommit.h" #include "syncIndexMgr.h" -#include "syncLogBuffer.h" +#include "syncPipeline.h" #include "syncMessage.h" #include "syncRaftEntry.h" #include "syncRaftStore.h" diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c index 457ef7eedd..8dd972506a 100644 --- a/source/libs/sync/src/syncMain.c +++ b/source/libs/sync/src/syncMain.c @@ -22,7 +22,7 @@ #include "syncEnv.h" #include "syncIndexMgr.h" #include "syncInt.h" -#include "syncLogBuffer.h" +#include "syncPipeline.h" #include "syncMessage.h" #include "syncRaftCfg.h" #include "syncRaftLog.h" diff --git a/source/libs/sync/src/syncLogBuffer.c b/source/libs/sync/src/syncPipeline.c similarity index 99% rename from source/libs/sync/src/syncLogBuffer.c rename to source/libs/sync/src/syncPipeline.c index 621bce6683..c8bb6260e8 100644 --- a/source/libs/sync/src/syncLogBuffer.c +++ b/source/libs/sync/src/syncPipeline.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE -#include "syncLogBuffer.h" +#include "syncPipeline.h" #include "syncIndexMgr.h" #include "syncInt.h" #include "syncRaftEntry.h" diff --git a/source/libs/sync/src/syncReplication.c b/source/libs/sync/src/syncReplication.c index e8709f95a2..d4a046b7ae 100644 --- a/source/libs/sync/src/syncReplication.c +++ b/source/libs/sync/src/syncReplication.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "syncReplication.h" #include "syncIndexMgr.h" -#include "syncLogBuffer.h" +#include "syncPipeline.h" #include "syncRaftEntry.h" #include "syncRaftStore.h" #include "syncUtil.h"