From 35e29f0bf6220a9bf1478372202bf2ce730440ce Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 12 Apr 2022 18:11:40 +0800 Subject: [PATCH] refact(cluster): node mgmt --- source/dnode/mgmt/CMakeLists.txt | 16 ++++++++++------ source/dnode/mgmt/{ => implement}/inc/dmInt.h | 0 source/dnode/mgmt/{dm => implement/src}/dmFile.c | 0 .../dnode/mgmt/{dm => implement/src}/dmHandle.c | 0 source/dnode/mgmt/{dm => implement/src}/dmInt.c | 0 .../dnode/mgmt/{dm => implement/src}/dmMonitor.c | 0 .../dnode/mgmt/{dm => implement/src}/dmWorker.c | 0 source/dnode/mgmt/{ => mgmt_bnode}/inc/bmInt.h | 0 .../dnode/mgmt/{bm => mgmt_bnode/src}/bmHandle.c | 0 source/dnode/mgmt/{bm => mgmt_bnode/src}/bmInt.c | 0 .../dnode/mgmt/{bm => mgmt_bnode/src}/bmWorker.c | 0 source/dnode/mgmt/{ => mgmt_mnode}/inc/mmInt.h | 0 .../dnode/mgmt/{mm => mgmt_mnode/src}/mmFile.c | 0 .../dnode/mgmt/{mm => mgmt_mnode/src}/mmHandle.c | 0 source/dnode/mgmt/{mm => mgmt_mnode/src}/mmInt.c | 0 .../dnode/mgmt/{mm => mgmt_mnode/src}/mmWorker.c | 0 source/dnode/mgmt/{ => mgmt_qnode}/inc/qmInt.h | 0 .../dnode/mgmt/{qm => mgmt_qnode/src}/qmHandle.c | 0 source/dnode/mgmt/{qm => mgmt_qnode/src}/qmInt.c | 0 .../dnode/mgmt/{qm => mgmt_qnode/src}/qmWorker.c | 0 source/dnode/mgmt/{ => mgmt_snode}/inc/smInt.h | 0 .../dnode/mgmt/{sm => mgmt_snode/src}/smHandle.c | 0 source/dnode/mgmt/{sm => mgmt_snode/src}/smInt.c | 0 .../dnode/mgmt/{sm => mgmt_snode/src}/smWorker.c | 0 source/dnode/mgmt/{ => mgmt_vnode}/inc/vmInt.h | 0 .../dnode/mgmt/{vm => mgmt_vnode/src}/vmFile.c | 0 .../dnode/mgmt/{vm => mgmt_vnode/src}/vmHandle.c | 0 source/dnode/mgmt/{vm => mgmt_vnode/src}/vmInt.c | 0 .../dnode/mgmt/{vm => mgmt_vnode/src}/vmWorker.c | 0 29 files changed, 10 insertions(+), 6 deletions(-) rename source/dnode/mgmt/{ => implement}/inc/dmInt.h (100%) rename source/dnode/mgmt/{dm => implement/src}/dmFile.c (100%) rename source/dnode/mgmt/{dm => implement/src}/dmHandle.c (100%) rename source/dnode/mgmt/{dm => implement/src}/dmInt.c (100%) rename source/dnode/mgmt/{dm => implement/src}/dmMonitor.c (100%) rename source/dnode/mgmt/{dm => implement/src}/dmWorker.c (100%) rename source/dnode/mgmt/{ => mgmt_bnode}/inc/bmInt.h (100%) rename source/dnode/mgmt/{bm => mgmt_bnode/src}/bmHandle.c (100%) rename source/dnode/mgmt/{bm => mgmt_bnode/src}/bmInt.c (100%) rename source/dnode/mgmt/{bm => mgmt_bnode/src}/bmWorker.c (100%) rename source/dnode/mgmt/{ => mgmt_mnode}/inc/mmInt.h (100%) rename source/dnode/mgmt/{mm => mgmt_mnode/src}/mmFile.c (100%) rename source/dnode/mgmt/{mm => mgmt_mnode/src}/mmHandle.c (100%) rename source/dnode/mgmt/{mm => mgmt_mnode/src}/mmInt.c (100%) rename source/dnode/mgmt/{mm => mgmt_mnode/src}/mmWorker.c (100%) rename source/dnode/mgmt/{ => mgmt_qnode}/inc/qmInt.h (100%) rename source/dnode/mgmt/{qm => mgmt_qnode/src}/qmHandle.c (100%) rename source/dnode/mgmt/{qm => mgmt_qnode/src}/qmInt.c (100%) rename source/dnode/mgmt/{qm => mgmt_qnode/src}/qmWorker.c (100%) rename source/dnode/mgmt/{ => mgmt_snode}/inc/smInt.h (100%) rename source/dnode/mgmt/{sm => mgmt_snode/src}/smHandle.c (100%) rename source/dnode/mgmt/{sm => mgmt_snode/src}/smInt.c (100%) rename source/dnode/mgmt/{sm => mgmt_snode/src}/smWorker.c (100%) rename source/dnode/mgmt/{ => mgmt_vnode}/inc/vmInt.h (100%) rename source/dnode/mgmt/{vm => mgmt_vnode/src}/vmFile.c (100%) rename source/dnode/mgmt/{vm => mgmt_vnode/src}/vmHandle.c (100%) rename source/dnode/mgmt/{vm => mgmt_vnode/src}/vmInt.c (100%) rename source/dnode/mgmt/{vm => mgmt_vnode/src}/vmWorker.c (100%) diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt index d36a9b8de7..281fea48de 100644 --- a/source/dnode/mgmt/CMakeLists.txt +++ b/source/dnode/mgmt/CMakeLists.txt @@ -1,12 +1,11 @@ add_subdirectory(interface) -aux_source_directory(dm DNODE_SRC) -aux_source_directory(qm DNODE_SRC) -aux_source_directory(bm DNODE_SRC) -aux_source_directory(sm DNODE_SRC) -aux_source_directory(vm DNODE_SRC) -aux_source_directory(mm DNODE_SRC) aux_source_directory(implement/src DNODE_SRC) +aux_source_directory(mgmt_bnode/src DNODE_SRC) +aux_source_directory(mgmt_mnode/src DNODE_SRC) +aux_source_directory(mgmt_qnode/src DNODE_SRC) +aux_source_directory(mgmt_snode/src DNODE_SRC) +aux_source_directory(mgmt_vnode/src DNODE_SRC) add_library(dnode STATIC ${DNODE_SRC}) target_link_libraries( dnode dnode_interface @@ -16,6 +15,11 @@ target_include_directories( PUBLIC "${TD_SOURCE_DIR}/include/dnode/mgmt" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/implement/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mgmt_bnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mgmt_mnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mgmt_qnode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mgmt_snode/inc" + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mgmt_vnode/inc" ) aux_source_directory(exe EXEC_SRC) diff --git a/source/dnode/mgmt/inc/dmInt.h b/source/dnode/mgmt/implement/inc/dmInt.h similarity index 100% rename from source/dnode/mgmt/inc/dmInt.h rename to source/dnode/mgmt/implement/inc/dmInt.h diff --git a/source/dnode/mgmt/dm/dmFile.c b/source/dnode/mgmt/implement/src/dmFile.c similarity index 100% rename from source/dnode/mgmt/dm/dmFile.c rename to source/dnode/mgmt/implement/src/dmFile.c diff --git a/source/dnode/mgmt/dm/dmHandle.c b/source/dnode/mgmt/implement/src/dmHandle.c similarity index 100% rename from source/dnode/mgmt/dm/dmHandle.c rename to source/dnode/mgmt/implement/src/dmHandle.c diff --git a/source/dnode/mgmt/dm/dmInt.c b/source/dnode/mgmt/implement/src/dmInt.c similarity index 100% rename from source/dnode/mgmt/dm/dmInt.c rename to source/dnode/mgmt/implement/src/dmInt.c diff --git a/source/dnode/mgmt/dm/dmMonitor.c b/source/dnode/mgmt/implement/src/dmMonitor.c similarity index 100% rename from source/dnode/mgmt/dm/dmMonitor.c rename to source/dnode/mgmt/implement/src/dmMonitor.c diff --git a/source/dnode/mgmt/dm/dmWorker.c b/source/dnode/mgmt/implement/src/dmWorker.c similarity index 100% rename from source/dnode/mgmt/dm/dmWorker.c rename to source/dnode/mgmt/implement/src/dmWorker.c diff --git a/source/dnode/mgmt/inc/bmInt.h b/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h similarity index 100% rename from source/dnode/mgmt/inc/bmInt.h rename to source/dnode/mgmt/mgmt_bnode/inc/bmInt.h diff --git a/source/dnode/mgmt/bm/bmHandle.c b/source/dnode/mgmt/mgmt_bnode/src/bmHandle.c similarity index 100% rename from source/dnode/mgmt/bm/bmHandle.c rename to source/dnode/mgmt/mgmt_bnode/src/bmHandle.c diff --git a/source/dnode/mgmt/bm/bmInt.c b/source/dnode/mgmt/mgmt_bnode/src/bmInt.c similarity index 100% rename from source/dnode/mgmt/bm/bmInt.c rename to source/dnode/mgmt/mgmt_bnode/src/bmInt.c diff --git a/source/dnode/mgmt/bm/bmWorker.c b/source/dnode/mgmt/mgmt_bnode/src/bmWorker.c similarity index 100% rename from source/dnode/mgmt/bm/bmWorker.c rename to source/dnode/mgmt/mgmt_bnode/src/bmWorker.c diff --git a/source/dnode/mgmt/inc/mmInt.h b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h similarity index 100% rename from source/dnode/mgmt/inc/mmInt.h rename to source/dnode/mgmt/mgmt_mnode/inc/mmInt.h diff --git a/source/dnode/mgmt/mm/mmFile.c b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c similarity index 100% rename from source/dnode/mgmt/mm/mmFile.c rename to source/dnode/mgmt/mgmt_mnode/src/mmFile.c diff --git a/source/dnode/mgmt/mm/mmHandle.c b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c similarity index 100% rename from source/dnode/mgmt/mm/mmHandle.c rename to source/dnode/mgmt/mgmt_mnode/src/mmHandle.c diff --git a/source/dnode/mgmt/mm/mmInt.c b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c similarity index 100% rename from source/dnode/mgmt/mm/mmInt.c rename to source/dnode/mgmt/mgmt_mnode/src/mmInt.c diff --git a/source/dnode/mgmt/mm/mmWorker.c b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c similarity index 100% rename from source/dnode/mgmt/mm/mmWorker.c rename to source/dnode/mgmt/mgmt_mnode/src/mmWorker.c diff --git a/source/dnode/mgmt/inc/qmInt.h b/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h similarity index 100% rename from source/dnode/mgmt/inc/qmInt.h rename to source/dnode/mgmt/mgmt_qnode/inc/qmInt.h diff --git a/source/dnode/mgmt/qm/qmHandle.c b/source/dnode/mgmt/mgmt_qnode/src/qmHandle.c similarity index 100% rename from source/dnode/mgmt/qm/qmHandle.c rename to source/dnode/mgmt/mgmt_qnode/src/qmHandle.c diff --git a/source/dnode/mgmt/qm/qmInt.c b/source/dnode/mgmt/mgmt_qnode/src/qmInt.c similarity index 100% rename from source/dnode/mgmt/qm/qmInt.c rename to source/dnode/mgmt/mgmt_qnode/src/qmInt.c diff --git a/source/dnode/mgmt/qm/qmWorker.c b/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c similarity index 100% rename from source/dnode/mgmt/qm/qmWorker.c rename to source/dnode/mgmt/mgmt_qnode/src/qmWorker.c diff --git a/source/dnode/mgmt/inc/smInt.h b/source/dnode/mgmt/mgmt_snode/inc/smInt.h similarity index 100% rename from source/dnode/mgmt/inc/smInt.h rename to source/dnode/mgmt/mgmt_snode/inc/smInt.h diff --git a/source/dnode/mgmt/sm/smHandle.c b/source/dnode/mgmt/mgmt_snode/src/smHandle.c similarity index 100% rename from source/dnode/mgmt/sm/smHandle.c rename to source/dnode/mgmt/mgmt_snode/src/smHandle.c diff --git a/source/dnode/mgmt/sm/smInt.c b/source/dnode/mgmt/mgmt_snode/src/smInt.c similarity index 100% rename from source/dnode/mgmt/sm/smInt.c rename to source/dnode/mgmt/mgmt_snode/src/smInt.c diff --git a/source/dnode/mgmt/sm/smWorker.c b/source/dnode/mgmt/mgmt_snode/src/smWorker.c similarity index 100% rename from source/dnode/mgmt/sm/smWorker.c rename to source/dnode/mgmt/mgmt_snode/src/smWorker.c diff --git a/source/dnode/mgmt/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h similarity index 100% rename from source/dnode/mgmt/inc/vmInt.h rename to source/dnode/mgmt/mgmt_vnode/inc/vmInt.h diff --git a/source/dnode/mgmt/vm/vmFile.c b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c similarity index 100% rename from source/dnode/mgmt/vm/vmFile.c rename to source/dnode/mgmt/mgmt_vnode/src/vmFile.c diff --git a/source/dnode/mgmt/vm/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c similarity index 100% rename from source/dnode/mgmt/vm/vmHandle.c rename to source/dnode/mgmt/mgmt_vnode/src/vmHandle.c diff --git a/source/dnode/mgmt/vm/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c similarity index 100% rename from source/dnode/mgmt/vm/vmInt.c rename to source/dnode/mgmt/mgmt_vnode/src/vmInt.c diff --git a/source/dnode/mgmt/vm/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c similarity index 100% rename from source/dnode/mgmt/vm/vmWorker.c rename to source/dnode/mgmt/mgmt_vnode/src/vmWorker.c