diff --git a/source/dnode/mgmt/bnode/src/bmMgmt.c b/source/dnode/mgmt/bnode/src/bmMgmt.c index 9f76f3b6a0..6bae56939f 100644 --- a/source/dnode/mgmt/bnode/src/bmMgmt.c +++ b/source/dnode/mgmt/bnode/src/bmMgmt.c @@ -15,7 +15,6 @@ #define _DEFAULT_SOURCE // #include "dndBnode.h" -// #include "dmInt.h" // #include "dndTransport.h" // #include "dndWorker.h" diff --git a/source/dnode/mgmt/container/src/dndMonitor.c b/source/dnode/mgmt/container/src/dndMonitor.c index 157d8b7547..866ab58b3f 100644 --- a/source/dnode/mgmt/container/src/dndMonitor.c +++ b/source/dnode/mgmt/container/src/dndMonitor.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "dndInt.h" -#include "dmInt.h" +#include "dm.h" #include "mm.h" #include "vmInt.h" diff --git a/source/dnode/mgmt/container/src/dndNode.c b/source/dnode/mgmt/container/src/dndNode.c index 20020d8963..73b65eb61f 100644 --- a/source/dnode/mgmt/container/src/dndNode.c +++ b/source/dnode/mgmt/container/src/dndNode.c @@ -17,7 +17,7 @@ #include "dndInt.h" #include "bmInt.h" -#include "dmInt.h" +#include "dm.h" #include "mm.h" #include "qmInt.h" #include "smInt.h" @@ -209,7 +209,7 @@ static int32_t dndRunInSingleProcess(SDnode *pDnode) { } SMgmtWrapper *pWrapper = dndGetWrapper(pDnode, DNODE); - if (dmStartWorker(pWrapper->pMgmt) != 0) { + if (dmStart(pWrapper) != 0) { dError("failed to start dnode worker since %s", terrstr()); return -1; } @@ -351,7 +351,7 @@ static int32_t dndRunInMultiProcess(SDnode *pDnode) { } SMgmtWrapper *pWrapper = dndGetWrapper(pDnode, DNODE); - if (pWrapper->procType == PROC_PARENT && dmStartWorker(pWrapper->pMgmt) != 0) { + if (pWrapper->procType == PROC_PARENT && dmStart(pWrapper->pMgmt) != 0) { dError("failed to start dnode worker since %s", terrstr()); return -1; } diff --git a/source/dnode/mgmt/container/src/dndTransport.c b/source/dnode/mgmt/container/src/dndTransport.c index 6c0d929d82..d4bfb30e92 100644 --- a/source/dnode/mgmt/container/src/dndTransport.c +++ b/source/dnode/mgmt/container/src/dndTransport.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "dndInt.h" -#include "dmInt.h" +#include "dm.h" #include "mm.h" #define INTERNAL_USER "_dnd" diff --git a/source/dnode/mgmt/mnode/src/mmInt.c b/source/dnode/mgmt/mnode/src/mmInt.c index 9b1db6757a..0ddeb86d87 100644 --- a/source/dnode/mgmt/mnode/src/mmInt.c +++ b/source/dnode/mgmt/mnode/src/mmInt.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "mmInt.h" -#include "dmInt.h" +#include "dm.h" SMnode *mmAcquire(SMnodeMgmt *pMgmt) { SMnode *pMnode = NULL; diff --git a/source/dnode/mgmt/mnode/src/mmMsg.c b/source/dnode/mgmt/mnode/src/mmMsg.c index dcd2f07aa8..637f42b228 100644 --- a/source/dnode/mgmt/mnode/src/mmMsg.c +++ b/source/dnode/mgmt/mnode/src/mmMsg.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "mmInt.h" -#include "dmInt.h" +#include "dm.h" int32_t mmProcessCreateReq(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) { SDnode *pDnode = pMgmt->pDnode; diff --git a/source/dnode/mgmt/mnode/src/mmWorker.c b/source/dnode/mgmt/mnode/src/mmWorker.c index e86024b688..bdd88c70aa 100644 --- a/source/dnode/mgmt/mnode/src/mmWorker.c +++ b/source/dnode/mgmt/mnode/src/mmWorker.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "mmInt.h" -#include "dmInt.h" +#include "dm.h" static void mmProcessQueue(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) { dTrace("msg:%p, will be processed", pMsg); diff --git a/source/dnode/mgmt/qnode/src/qmMgmt.c b/source/dnode/mgmt/qnode/src/qmMgmt.c index 76746d0f77..ddd0043e22 100644 --- a/source/dnode/mgmt/qnode/src/qmMgmt.c +++ b/source/dnode/mgmt/qnode/src/qmMgmt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE // #include "dndQnode.h" -// #include "dmInt.h" +// #include "dm.h" // #include "dndTransport.h" // #include "dndWorker.h" diff --git a/source/dnode/mgmt/snode/src/smMgmt.c b/source/dnode/mgmt/snode/src/smMgmt.c index 09959bcf09..6af9e68ef4 100644 --- a/source/dnode/mgmt/snode/src/smMgmt.c +++ b/source/dnode/mgmt/snode/src/smMgmt.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE // #include "dndSnode.h" -// #include "dmInt.h" +// #include "dm.h" // #include "dndTransport.h" // #include "dndWorker.h" diff --git a/source/dnode/mgmt/vnode/src/vmMsg.c b/source/dnode/mgmt/vnode/src/vmMsg.c index b4d51fed5c..1d3e47939b 100644 --- a/source/dnode/mgmt/vnode/src/vmMsg.c +++ b/source/dnode/mgmt/vnode/src/vmMsg.c @@ -17,7 +17,7 @@ #include "vmMsg.h" #include "vmFile.h" #include "vmWorker.h" -#include "dmInt.h" +#include "dm.h" static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) { pCfg->vgId = pCreate->vgId;