xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

minor changes in mnode

This commit is contained in:
Shengliang Guan 2021-11-27 22:46:12 +08:00
parent c4306958c7
commit 5cebfe33f4
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/dnode/mnode/impl/inc/mnodeInt.h
View File

@ -24,16 +24,16 @@
extern "C" { extern "C" {
#endif #endif
typedef int32_t (*MnodeRpcFp)(SMnodeMsg *pMsg); typedef int32_t (*MndMsgFp)(SMnode *pMnode, SMnodeMsg *pMsg);
typedef struct SMnodeBak { typedef struct SMnodeBak {
int32_t dnodeId; int32_t dnodeId;
int64_t clusterId; int64_t clusterId;
tmr_h timer; tmr_h timer;
SSteps *pInitSteps; SSteps *pInitSteps;
SSteps *pStartSteps; SSteps *pStartSteps;
SMnodeOpt para; SMnodeOpt para;
MnodeRpcFp msgFp[TSDB_MSG_TYPE_MAX]; MndMsgFp msgFp[TSDB_MSG_TYPE_MAX];
} SMnodeBak; } SMnodeBak;
typedef struct SMnode { typedef struct SMnode {
@ -47,7 +47,7 @@ typedef struct SMnode {
SSteps *pStartSteps; SSteps *pStartSteps;
struct SSdb *pSdb; struct SSdb *pSdb;
struct SDnode *pServer; struct SDnode *pServer;
MnodeRpcFp msgFp[TSDB_MSG_TYPE_MAX]; MndMsgFp msgFp[TSDB_MSG_TYPE_MAX];
PutMsgToMnodeQFp putMsgToApplyMsgFp; PutMsgToMnodeQFp putMsgToApplyMsgFp;
SendMsgToDnodeFp sendMsgToDnodeFp; SendMsgToDnodeFp sendMsgToDnodeFp;
SendMsgToMnodeFp sendMsgToMnodeFp; SendMsgToMnodeFp sendMsgToMnodeFp;
@ -61,8 +61,7 @@ int64_t mnodeGetClusterId();
void mnodeSendMsgToDnode(SMnode *pMnode, struct SEpSet *epSet, struct SRpcMsg *rpcMsg); void mnodeSendMsgToDnode(SMnode *pMnode, struct SEpSet *epSet, struct SRpcMsg *rpcMsg);
void mnodeSendMsgToMnode(SMnode *pMnode, struct SRpcMsg *rpcMsg); void mnodeSendMsgToMnode(SMnode *pMnode, struct SRpcMsg *rpcMsg);
void mnodeSendRedirectMsg(SMnode *pMnode, struct SRpcMsg *rpcMsg, bool forShell); void mnodeSendRedirectMsg(SMnode *pMnode, struct SRpcMsg *rpcMsg, bool forShell);
void mnodeSetMsgHandle(SMnode *pMnode, int32_t msgType, MndMsgFp fp);
void mnodeSetMsgFp(int32_t msgType, MnodeRpcFp fp);
#ifdef __cplusplus #ifdef __cplusplus
} }

8
source/dnode/mnode/impl/src/mnode.c
View File

@ -218,18 +218,18 @@ static void mnodeProcessRpcMsg(SMnodeMsg *pMsg) {
int32_t msgType = pMsg->rpcMsg.msgType; int32_t msgType = pMsg->rpcMsg.msgType;
MnodeRpcFp fp = tsMint.msgFp[msgType]; MndMsgFp fp = tsMint.msgFp[msgType];
if (fp == NULL) { if (fp == NULL) {
} }
int32_t code = (fp)(pMsg); int32_t code = (*fp)(NULL, pMsg);
if (code != 0) { if (code != 0) {
assert(code); assert(code);
} }
} }
void mnodeSetMsgFp(int32_t msgType, MnodeRpcFp fp) { void mnodeSetMsgHandle(SMnode *pMnode, int32_t msgType, MndMsgFp fp) {
if (msgType > 0 || msgType < TSDB_MSG_TYPE_MAX) { if (msgType >= 0 && msgType < TSDB_MSG_TYPE_MAX) {
tsMint.msgFp[msgType] = fp; tsMint.msgFp[msgType] = fp;
} }
} }

4
source/dnode/mnode/impl/src/mnodeUser.c
View File

@ -179,7 +179,7 @@ static int32_t mnodeCreateUser(char *acct, char *user, char *pass, SMnodeMsg *pM
return 0; return 0;
} }
static int32_t mnodeProcessCreateUserMsg(SMnodeMsg *pMsg) { static int32_t mnodeProcessCreateUserMsg(SMnode *pMnode, SMnodeMsg *pMsg) {
SCreateUserMsg *pCreate = pMsg->rpcMsg.pCont; SCreateUserMsg *pCreate = pMsg->rpcMsg.pCont;
if (pCreate->user[0] == 0) { if (pCreate->user[0] == 0) {
@ -231,7 +231,7 @@ int32_t mnodeInitUser() {
.deleteFp = (SdbDeleteFp)mnodeUserActionDelete}; .deleteFp = (SdbDeleteFp)mnodeUserActionDelete};
sdbSetTable(table); sdbSetTable(table);
mnodeSetMsgFp(TSDB_MSG_TYPE_CREATE_USER, mnodeProcessCreateUserMsg); mnodeSetMsgHandle(NULL, TSDB_MSG_TYPE_CREATE_USER, mnodeProcessCreateUserMsg);
return 0; return 0;
} }