From abc947cecd7eca6ff42d11d7e164981dfab177e3 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 28 May 2020 14:37:30 +0000 Subject: [PATCH] [TD-335] rename some functions --- src/dnode/inc/dnodeMPeer.h | 4 ++-- src/dnode/src/dnodeMPeer.c | 4 ++-- src/dnode/src/dnodeVRead.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dnode/inc/dnodeMPeer.h b/src/dnode/inc/dnodeMPeer.h index cdbb4a210c..9a48703110 100644 --- a/src/dnode/inc/dnodeMPeer.h +++ b/src/dnode/inc/dnodeMPeer.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#ifndef TDENGINE_DNODE_MMGMT_H -#define TDENGINE_DNODE_MMGMT_H +#ifndef TDENGINE_DNODE_MPEER_H +#define TDENGINE_DNODE_MPEER_H #ifdef __cplusplus extern "C" { diff --git a/src/dnode/src/dnodeMPeer.c b/src/dnode/src/dnodeMPeer.c index da1910a691..e3ba5fcf01 100644 --- a/src/dnode/src/dnodeMPeer.c +++ b/src/dnode/src/dnodeMPeer.c @@ -119,7 +119,7 @@ void dnodeDispatchToMnodePeerQueue(SRpcMsg *pMsg) { taosWriteQitem(tsMPeerQueue, TAOS_QTYPE_RPC, pPeer); } -static void dnodeFreeMnodePeadMsg(SMnodeMsg *pPeer) { +static void dnodeFreeMnodePeerMsg(SMnodeMsg *pPeer) { mnodeCleanupMsg(pPeer); taosFreeQitem(pPeer); } @@ -135,7 +135,7 @@ static void dnodeSendRpcMnodePeerRsp(SMnodeMsg *pPeer, int32_t code) { }; rpcSendResponse(&rpcRsp); - dnodeFreeMnodePeadMsg(pPeer); + dnodeFreeMnodePeerMsg(pPeer); } static void *dnodeProcessMnodePeerQueue(void *param) { diff --git a/src/dnode/src/dnodeVRead.c b/src/dnode/src/dnodeVRead.c index 4b1ff84bec..1ff868d0ff 100644 --- a/src/dnode/src/dnodeVRead.c +++ b/src/dnode/src/dnodeVRead.c @@ -92,7 +92,7 @@ void dnodeCleanupVnodeRead() { } void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) { - int32_t mnodeMsgNum = 0; + int32_t queuedMsgNum = 0; int32_t leftLen = pMsg->contLen; char *pCont = (char *) pMsg->pCont; void *pVnode; @@ -124,12 +124,12 @@ void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) { // next vnode leftLen -= pHead->contLen; pCont -= pHead->contLen; - mnodeMsgNum++; + queuedMsgNum++; taosWriteQitem(queue, TAOS_QTYPE_RPC, pRead); } - if (mnodeMsgNum == 0) { + if (queuedMsgNum == 0) { SRpcMsg rpcRsp = { .handle = pMsg->handle, .pCont = NULL, -- GitLab