From 06dbe69f87c44be8d2e24e614fdb8e1d6524e58b Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 15 Mar 2022 14:50:04 +0800 Subject: [PATCH] rename --- .../mgmt/bnode/inc/{bmHandle.h => bmMsg.h} | 0 source/dnode/mgmt/bnode/src/bmInt.c | 2 +- .../mgmt/bnode/src/{bmHandle.c => bmMsg.c} | 2 +- source/dnode/mgmt/mnode/inc/mmInt.h | 18 +++++++----------- .../mgmt/mnode/inc/{mmHandle.h => mmMsg.h} | 6 +++--- source/dnode/mgmt/mnode/src/mmInt.c | 2 +- .../mgmt/mnode/src/{mmHandle.c => mmMsg.c} | 2 +- .../mgmt/qnode/inc/{qmHandle.h => qmMsg.h} | 0 source/dnode/mgmt/qnode/src/qmInt.c | 2 +- .../mgmt/qnode/src/{qmHandle.c => qmMsg.c} | 2 +- .../mgmt/snode/inc/{smHandle.h => smMsg.h} | 0 source/dnode/mgmt/snode/src/smInt.c | 2 +- .../mgmt/snode/src/{smHandle.c => smMsg.c} | 2 +- .../mgmt/vnode/inc/{vmHandle.h => vmMsg.h} | 0 source/dnode/mgmt/vnode/src/vmInt.c | 2 +- .../mgmt/vnode/src/{vmHandle.c => vmMsg.c} | 2 +- 16 files changed, 20 insertions(+), 24 deletions(-) rename source/dnode/mgmt/bnode/inc/{bmHandle.h => bmMsg.h} (100%) rename source/dnode/mgmt/bnode/src/{bmHandle.c => bmMsg.c} (97%) rename source/dnode/mgmt/mnode/inc/{mmHandle.h => mmMsg.h} (92%) rename source/dnode/mgmt/mnode/src/{mmHandle.c => mmMsg.c} (99%) rename source/dnode/mgmt/qnode/inc/{qmHandle.h => qmMsg.h} (100%) rename source/dnode/mgmt/qnode/src/{qmHandle.c => qmMsg.c} (97%) rename source/dnode/mgmt/snode/inc/{smHandle.h => smMsg.h} (100%) rename source/dnode/mgmt/snode/src/{smHandle.c => smMsg.c} (97%) rename source/dnode/mgmt/vnode/inc/{vmHandle.h => vmMsg.h} (100%) rename source/dnode/mgmt/vnode/src/{vmHandle.c => vmMsg.c} (99%) diff --git a/source/dnode/mgmt/bnode/inc/bmHandle.h b/source/dnode/mgmt/bnode/inc/bmMsg.h similarity index 100% rename from source/dnode/mgmt/bnode/inc/bmHandle.h rename to source/dnode/mgmt/bnode/inc/bmMsg.h diff --git a/source/dnode/mgmt/bnode/src/bmInt.c b/source/dnode/mgmt/bnode/src/bmInt.c index a9beff5756..6241b2e8b2 100644 --- a/source/dnode/mgmt/bnode/src/bmInt.c +++ b/source/dnode/mgmt/bnode/src/bmInt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "bmInt.h" -#include "bmHandle.h" +#include "bmMsg.h" bool bmRequireNode(SMgmtWrapper *pWrapper) { return false; } diff --git a/source/dnode/mgmt/bnode/src/bmHandle.c b/source/dnode/mgmt/bnode/src/bmMsg.c similarity index 97% rename from source/dnode/mgmt/bnode/src/bmHandle.c rename to source/dnode/mgmt/bnode/src/bmMsg.c index 0c656398a1..5cf1901656 100644 --- a/source/dnode/mgmt/bnode/src/bmHandle.c +++ b/source/dnode/mgmt/bnode/src/bmMsg.c @@ -14,7 +14,7 @@ */ #define _DEFAULT_SOURCE -#include "bmHandle.h" +#include "bmMsg.h" #include "bmWorker.h" int32_t bmProcessCreateReq(SDnode *pDnode, SRpcMsg *pRpcMsg) {return 0;} diff --git a/source/dnode/mgmt/mnode/inc/mmInt.h b/source/dnode/mgmt/mnode/inc/mmInt.h index fee2b65126..1f7d94aa27 100644 --- a/source/dnode/mgmt/mnode/inc/mmInt.h +++ b/source/dnode/mgmt/mnode/inc/mmInt.h @@ -22,30 +22,26 @@ extern "C" { #endif - - typedef struct SMnodeMgmt { int32_t refCount; int8_t deployed; int8_t dropped; + int8_t replica; + int8_t selfIndex; + SReplica replicas[TSDB_MAX_REPLICA]; SMnode *pMnode; + SProcObj *pProcess; + bool singleProc; SRWLatch latch; SDnodeWorker readWorker; SDnodeWorker writeWorker; SDnodeWorker syncWorker; - int8_t replica; - int8_t selfIndex; - SReplica replicas[TSDB_MAX_REPLICA]; - - // - SProcObj *pProcess; - bool singleProc; } SMnodeMgmt; - -// interface +// mmInt.h void mmGetMgmtFp(SMgmtWrapper *pMgmt); +// mmMgmt.h int32_t mmInit(SDnode *pDnode); void mmCleanup(SDnode *pDnode); diff --git a/source/dnode/mgmt/mnode/inc/mmHandle.h b/source/dnode/mgmt/mnode/inc/mmMsg.h similarity index 92% rename from source/dnode/mgmt/mnode/inc/mmHandle.h rename to source/dnode/mgmt/mnode/inc/mmMsg.h index 2206e382ce..620d2903e4 100644 --- a/source/dnode/mgmt/mnode/inc/mmHandle.h +++ b/source/dnode/mgmt/mnode/inc/mmMsg.h @@ -13,8 +13,8 @@ * along with this program. If not, see . */ -#ifndef _TD_DND_MNODE_HANDLE_H_ -#define _TD_DND_MNODE_HANDLE_H_ +#ifndef _TD_DND_MNODE_MSG_H_ +#define _TD_DND_MNODE_MSG_H_ #include "mmInt.h" @@ -36,4 +36,4 @@ int32_t mmGetMonitorInfo(SDnode *pDnode, SMonClusterInfo *pClusterInfo, SMonVgro } #endif -#endif /*_TD_DND_MNODE_HANDLE_H_*/ \ No newline at end of file +#endif /*_TD_DND_MNODE_MSG_H_*/ \ No newline at end of file diff --git a/source/dnode/mgmt/mnode/src/mmInt.c b/source/dnode/mgmt/mnode/src/mmInt.c index a2118c4d44..77d94ffef5 100644 --- a/source/dnode/mgmt/mnode/src/mmInt.c +++ b/source/dnode/mgmt/mnode/src/mmInt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "mmInt.h" -#include "mmHandle.h" +#include "mmMsg.h" bool mmRequireNode(SMgmtWrapper *pWrapper) { return false; } diff --git a/source/dnode/mgmt/mnode/src/mmHandle.c b/source/dnode/mgmt/mnode/src/mmMsg.c similarity index 99% rename from source/dnode/mgmt/mnode/src/mmHandle.c rename to source/dnode/mgmt/mnode/src/mmMsg.c index 9ad4a7937b..389ebfe853 100644 --- a/source/dnode/mgmt/mnode/src/mmHandle.c +++ b/source/dnode/mgmt/mnode/src/mmMsg.c @@ -14,7 +14,7 @@ */ #define _DEFAULT_SOURCE -#include "mmHandle.h" +#include "mmMsg.h" #include "mmWorker.h" #if 0 diff --git a/source/dnode/mgmt/qnode/inc/qmHandle.h b/source/dnode/mgmt/qnode/inc/qmMsg.h similarity index 100% rename from source/dnode/mgmt/qnode/inc/qmHandle.h rename to source/dnode/mgmt/qnode/inc/qmMsg.h diff --git a/source/dnode/mgmt/qnode/src/qmInt.c b/source/dnode/mgmt/qnode/src/qmInt.c index 9059942a3a..ae7fce26cf 100644 --- a/source/dnode/mgmt/qnode/src/qmInt.c +++ b/source/dnode/mgmt/qnode/src/qmInt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "qmInt.h" -#include "qmHandle.h" +#include "qmMsg.h" bool qmRequireNode(SMgmtWrapper *pWrapper) { return false; } diff --git a/source/dnode/mgmt/qnode/src/qmHandle.c b/source/dnode/mgmt/qnode/src/qmMsg.c similarity index 97% rename from source/dnode/mgmt/qnode/src/qmHandle.c rename to source/dnode/mgmt/qnode/src/qmMsg.c index d04650913a..af0747a357 100644 --- a/source/dnode/mgmt/qnode/src/qmHandle.c +++ b/source/dnode/mgmt/qnode/src/qmMsg.c @@ -14,7 +14,7 @@ */ #define _DEFAULT_SOURCE -#include "qmHandle.h" +#include "qmMsg.h" #include "qmWorker.h" int32_t qmProcessCreateReq(SDnode *pDnode, SRpcMsg *pRpcMsg) {return 0;} diff --git a/source/dnode/mgmt/snode/inc/smHandle.h b/source/dnode/mgmt/snode/inc/smMsg.h similarity index 100% rename from source/dnode/mgmt/snode/inc/smHandle.h rename to source/dnode/mgmt/snode/inc/smMsg.h diff --git a/source/dnode/mgmt/snode/src/smInt.c b/source/dnode/mgmt/snode/src/smInt.c index eb0db21f03..0b367d2660 100644 --- a/source/dnode/mgmt/snode/src/smInt.c +++ b/source/dnode/mgmt/snode/src/smInt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "smInt.h" -#include "smHandle.h" +#include "smMsg.h" bool smRequireNode(SMgmtWrapper *pWrapper) { return false; } diff --git a/source/dnode/mgmt/snode/src/smHandle.c b/source/dnode/mgmt/snode/src/smMsg.c similarity index 97% rename from source/dnode/mgmt/snode/src/smHandle.c rename to source/dnode/mgmt/snode/src/smMsg.c index a9a73199fb..44bc8fe329 100644 --- a/source/dnode/mgmt/snode/src/smHandle.c +++ b/source/dnode/mgmt/snode/src/smMsg.c @@ -14,7 +14,7 @@ */ #define _DEFAULT_SOURCE -#include "smHandle.h" +#include "smMsg.h" #include "smWorker.h" int32_t smProcessCreateReq(SDnode *pDnode, SRpcMsg *pRpcMsg) {return 0;} diff --git a/source/dnode/mgmt/vnode/inc/vmHandle.h b/source/dnode/mgmt/vnode/inc/vmMsg.h similarity index 100% rename from source/dnode/mgmt/vnode/inc/vmHandle.h rename to source/dnode/mgmt/vnode/inc/vmMsg.h diff --git a/source/dnode/mgmt/vnode/src/vmInt.c b/source/dnode/mgmt/vnode/src/vmInt.c index 6be4e87744..966b06c85c 100644 --- a/source/dnode/mgmt/vnode/src/vmInt.c +++ b/source/dnode/mgmt/vnode/src/vmInt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "vmInt.h" -#include "vmHandle.h" +#include "vmMsg.h" #include "vmMgmt.h" static int32_t vmInit(SMgmtWrapper *pWrapper) { diff --git a/source/dnode/mgmt/vnode/src/vmHandle.c b/source/dnode/mgmt/vnode/src/vmMsg.c similarity index 99% rename from source/dnode/mgmt/vnode/src/vmHandle.c rename to source/dnode/mgmt/vnode/src/vmMsg.c index 629b2c086e..2bdd44b503 100644 --- a/source/dnode/mgmt/vnode/src/vmHandle.c +++ b/source/dnode/mgmt/vnode/src/vmMsg.c @@ -14,7 +14,7 @@ */ #define _DEFAULT_SOURCE -#include "vmHandle.h" +#include "vmMsg.h" #include "vmWorker.h" -- GitLab