refactor: node mgmt

source/dnode/mgmt/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_subdirectory(node_mgmt)
-add_subdirectory(node_common)
+add_subdirectory(node_util)
 add_subdirectory(mgmt_bnode)
 add_subdirectory(mgmt_mnode)
 add_subdirectory(mgmt_qnode)

source/dnode/mgmt/mgmt_bnode/CMakeLists.txt

@@ -5,5 +5,5 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    mgmt_bnode node_common
+    mgmt_bnode node_util
 )

source/dnode/mgmt/mgmt_bnode/inc/bmInt.h

@@ -16,7 +16,7 @@
 #ifndef _TD_DND_BNODE_INT_H_
 #define _TD_DND_BNODE_INT_H_
 
-#include "dmInt.h"
+#include "dmUtil.h"
 
 #include "bnode.h"
 

source/dnode/mgmt/mgmt_mnode/CMakeLists.txt

@@ -5,5 +5,5 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    mgmt_mnode node_common
+    mgmt_mnode node_util
 )

source/dnode/mgmt/mgmt_mnode/inc/mmInt.h

@@ -16,7 +16,7 @@
 #ifndef _TD_DND_MNODE_INT_H_
 #define _TD_DND_MNODE_INT_H_
 
-#include "dmInt.h"
+#include "dmUtil.h"
 #include "mnode.h"
 
 #ifdef __cplusplus

source/dnode/mgmt/mgmt_qnode/CMakeLists.txt

@@ -5,5 +5,5 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    mgmt_qnode node_common
+    mgmt_qnode node_util
 )

source/dnode/mgmt/mgmt_qnode/inc/qmInt.h

@@ -16,7 +16,7 @@
 #ifndef _TD_DND_QNODE_INT_H_
 #define _TD_DND_QNODE_INT_H_
 
-#include "dmInt.h"
+#include "dmUtil.h"
 
 #include "qnode.h"
 

source/dnode/mgmt/mgmt_snode/CMakeLists.txt

@@ -5,5 +5,5 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    mgmt_snode node_common
+    mgmt_snode node_util
 )

source/dnode/mgmt/mgmt_snode/inc/smInt.h

@@ -16,7 +16,7 @@
 #ifndef _TD_DND_SNODE_INT_H_
 #define _TD_DND_SNODE_INT_H_
 
-#include "dmInt.h"
+#include "dmUtil.h"
 
 #include "snode.h"
 

source/dnode/mgmt/mgmt_vnode/CMakeLists.txt

@@ -5,5 +5,5 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
-    mgmt_vnode node_common
+    mgmt_vnode node_util
 )

source/dnode/mgmt/mgmt_vnode/inc/vmInt.h

@@ -16,7 +16,7 @@
 #ifndef _TD_DND_VNODES_INT_H_
 #define _TD_DND_VNODES_INT_H_
 
-#include "dmInt.h"
+#include "dmUtil.h"
 
 #include "sync.h"
 #include "vnode.h"

source/dnode/mgmt/node_common/CMakeLists.txt

@@ -1,10 +0,0 @@
-aux_source_directory(src DNODE_INTERFACE)
-add_library(node_common STATIC ${DNODE_INTERFACE})
-target_include_directories(
-    node_common
-    PUBLIC "${TD_SOURCE_DIR}/include/dnode/mgmt"
-    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-target_link_libraries(
-    node_common cjson mnode vnode qnode snode bnode wal sync taos_static tfs monitor
-)

source/dnode/mgmt/node_util/CMakeLists.txt

@@ -0,0 +1,10 @@
+aux_source_directory(src NODE_UTIL)
+add_library(node_util STATIC ${NODE_UTIL})
+target_include_directories(
+    node_util
+    PUBLIC "${TD_SOURCE_DIR}/include/dnode/mgmt"
+    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+target_link_libraries(
+    node_util cjson mnode vnode qnode snode bnode wal sync taos_static tfs monitor
+)

source/dnode/mgmt/node_util/inc/dmUtil.h

@@ -133,6 +133,7 @@ typedef struct {
 const char *dmStatStr(EDndRunStatus stype);
 const char *dmNodeLogName(EDndNodeType ntype);
 const char *dmNodeProcName(EDndNodeType ntype);
+const char *dmNodeName(EDndNodeType ntype);
 const char *dmEventStr(EDndEvent etype);
 const char *dmProcStr(EDndProcType ptype);
 void       *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId);

source/dnode/mgmt/node_util/src/dmEnv.c

@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dmInt.h"
+#include "dmUtil.h"
 
 static int8_t once = DND_ENV_INIT;
 

source/dnode/mgmt/node_util/src/dmFile.c

@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dmInt.h"
+#include "dmUtil.h"
 
 #define MAXLEN 1024
 

source/dnode/mgmt/node_util/src/dmUtil.c

@@ -14,7 +14,7 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "dmInt.h"
+#include "dmUtil.h"
 
 
 const char *dmStatStr(EDndRunStatus stype) {
@@ -64,6 +64,23 @@ const char *dmNodeProcName(EDndNodeType ntype) {
   }
 }
 
+const char *dmNodeName(EDndNodeType ntype) {
+  switch (ntype) {
+    case VNODE:
+      return "vnode";
+    case QNODE:
+      return "qnode";
+    case SNODE:
+      return "snode";
+    case MNODE:
+      return "mnode";
+    case BNODE:
+      return "bnode";
+    default:
+      return "dnode";
+  }
+}
+
 const char *dmEventStr(EDndEvent ev) {
   switch (ev) {
     case DND_EVENT_START: