提交 64633e3d 编写于 作者: S Shengliang Guan

enh: refact syncMsg code

上级 ee63b498
...@@ -234,7 +234,7 @@ int32_t mndInitSync(SMnode *pMnode) { ...@@ -234,7 +234,7 @@ int32_t mndInitSync(SMnode *pMnode) {
.batchSize = 1, .batchSize = 1,
.vgId = 1, .vgId = 1,
.pWal = pMnode->pWal, .pWal = pMnode->pWal,
.msgcb = NULL, .msgcb = &pMnode->msgCb,
.syncSendMSg = mndSyncSendMsg, .syncSendMSg = mndSyncSendMsg,
.syncEqMsg = mndSyncEqMsg, .syncEqMsg = mndSyncEqMsg,
.syncEqCtrlMsg = mndSyncEqCtrlMsg, .syncEqCtrlMsg = mndSyncEqCtrlMsg,
......
...@@ -325,13 +325,13 @@ static void vnodeSyncApplyMsg(const SSyncFSM *pFsm, const SRpcMsg *pMsg, const S ...@@ -325,13 +325,13 @@ static void vnodeSyncApplyMsg(const SSyncFSM *pFsm, const SRpcMsg *pMsg, const S
static void vnodeSyncCommitMsg(const SSyncFSM *pFsm, const SRpcMsg *pMsg, const SFsmCbMeta *pMeta) { static void vnodeSyncCommitMsg(const SSyncFSM *pFsm, const SRpcMsg *pMsg, const SFsmCbMeta *pMeta) {
if (pMeta->isWeak == 0) { if (pMeta->isWeak == 0) {
vnodeSyncApplyMsg(pFsm->data, pMsg, pMeta); vnodeSyncApplyMsg(pFsm, pMsg, pMeta);
} }
} }
static void vnodeSyncPreCommitMsg(const SSyncFSM *pFsm, const SRpcMsg *pMsg, const SFsmCbMeta *pMeta) { static void vnodeSyncPreCommitMsg(const SSyncFSM *pFsm, const SRpcMsg *pMsg, const SFsmCbMeta *pMeta) {
if (pMeta->isWeak == 1) { if (pMeta->isWeak == 1) {
vnodeSyncApplyMsg(pFsm->data, pMsg, pMeta); vnodeSyncApplyMsg(pFsm, pMsg, pMeta);
} }
} }
...@@ -514,7 +514,7 @@ int32_t vnodeSyncOpen(SVnode *pVnode, char *path) { ...@@ -514,7 +514,7 @@ int32_t vnodeSyncOpen(SVnode *pVnode, char *path) {
.vgId = pVnode->config.vgId, .vgId = pVnode->config.vgId,
.syncCfg = pVnode->config.syncCfg, .syncCfg = pVnode->config.syncCfg,
.pWal = pVnode->pWal, .pWal = pVnode->pWal,
.msgcb = NULL, .msgcb = &pVnode->msgCb,
.syncSendMSg = vnodeSyncSendMsg, .syncSendMSg = vnodeSyncSendMsg,
.syncEqMsg = vnodeSyncEqMsg, .syncEqMsg = vnodeSyncEqMsg,
.syncEqCtrlMsg = vnodeSyncEqCtrlMsg, .syncEqCtrlMsg = vnodeSyncEqCtrlMsg,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册