From 3536ead6ff9d5b9a106dbcb10ee7b7e0dd82dda2 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 5 Nov 2021 19:23:28 +0800 Subject: [PATCH] change source directory --- include/{server => dnode}/mnode/mnode.h | 0 .../dnode/mnode/sdb/sdb.h | 0 include/dnode/mnode/transaction/trn.h | 0 include/{server => dnode}/qnode/qnode.h | 0 include/{server => dnode}/vnode/meta/meta.h | 0 include/{server => dnode}/vnode/tq/tq.h | 0 .../{server => dnode}/vnode/tsdb/impl/tsdbImpl.h | 0 include/{server => dnode}/vnode/tsdb/tsdb.h | 0 include/{server => dnode}/vnode/vnode.h | 0 source/dnode/mgmt/CMakeLists.txt | 2 +- source/dnode/mnode/CMakeLists.txt | 15 +++------------ source/dnode/mnode/impl/CMakeLists.txt | 12 ++++++++++++ source/dnode/mnode/{ => impl}/inc/mnodeAcct.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeAuth.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeBalance.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeCluster.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeDb.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeDef.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeDnode.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeFunc.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeInt.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeMnode.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeOper.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeProfile.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeSdb.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeShow.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeStable.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeSync.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeTelem.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeUser.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeVgroup.h | 0 source/dnode/mnode/{ => impl}/inc/mnodeWorker.h | 0 source/dnode/mnode/{ => impl}/src/mnodeAcct.c | 0 source/dnode/mnode/{ => impl}/src/mnodeAuth.c | 0 source/dnode/mnode/{ => impl}/src/mnodeBalance.c | 0 source/dnode/mnode/{ => impl}/src/mnodeCluster.c | 0 source/dnode/mnode/{ => impl}/src/mnodeDb.c | 0 source/dnode/mnode/{ => impl}/src/mnodeDnode.c | 0 source/dnode/mnode/{ => impl}/src/mnodeFunc.c | 0 source/dnode/mnode/{ => impl}/src/mnodeMnode.c | 0 source/dnode/mnode/{ => impl}/src/mnodeOper.c | 0 source/dnode/mnode/{ => impl}/src/mnodeProfile.c | 0 source/dnode/mnode/{ => impl}/src/mnodeSdb.c | 0 source/dnode/mnode/{ => impl}/src/mnodeShow.c | 0 source/dnode/mnode/{ => impl}/src/mnodeStable.c | 0 source/dnode/mnode/{ => impl}/src/mnodeSync.c | 0 source/dnode/mnode/{ => impl}/src/mnodeTelem.c | 0 source/dnode/mnode/{ => impl}/src/mnodeUser.c | 0 source/dnode/mnode/{ => impl}/src/mnodeVgroup.c | 0 source/dnode/mnode/{ => impl}/src/mnodeWorker.c | 0 source/dnode/mnode/{ => impl}/src/mondeInt.c | 0 source/dnode/mnode/impl/test/mnodeTests.cpp | 0 source/dnode/mnode/sdb/CMakeLists.txt | 11 +++++++++++ source/dnode/mnode/sdb/src/sdb.c | 0 source/dnode/mnode/transaction/CMakeLists.txt | 11 +++++++++++ source/dnode/mnode/transaction/src/trn.c | 0 source/dnode/qnode/CMakeLists.txt | 2 +- source/dnode/vnode/impl/CMakeLists.txt | 2 +- source/dnode/vnode/meta/CMakeLists.txt | 2 +- source/dnode/vnode/meta/test/CMakeLists.txt | 2 +- source/dnode/vnode/tq/CMakeLists.txt | 2 +- source/dnode/vnode/tsdb/CMakeLists.txt | 2 +- 62 files changed, 44 insertions(+), 19 deletions(-) rename include/{server => dnode}/mnode/mnode.h (100%) rename source/dnode/mnode/test/mnodeTests.cpp => include/dnode/mnode/sdb/sdb.h (100%) create mode 100644 include/dnode/mnode/transaction/trn.h rename include/{server => dnode}/qnode/qnode.h (100%) rename include/{server => dnode}/vnode/meta/meta.h (100%) rename include/{server => dnode}/vnode/tq/tq.h (100%) rename include/{server => dnode}/vnode/tsdb/impl/tsdbImpl.h (100%) rename include/{server => dnode}/vnode/tsdb/tsdb.h (100%) rename include/{server => dnode}/vnode/vnode.h (100%) create mode 100644 source/dnode/mnode/impl/CMakeLists.txt rename source/dnode/mnode/{ => impl}/inc/mnodeAcct.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeAuth.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeBalance.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeCluster.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeDb.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeDef.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeDnode.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeFunc.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeInt.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeMnode.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeOper.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeProfile.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeSdb.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeShow.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeStable.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeSync.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeTelem.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeUser.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeVgroup.h (100%) rename source/dnode/mnode/{ => impl}/inc/mnodeWorker.h (100%) rename source/dnode/mnode/{ => impl}/src/mnodeAcct.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeAuth.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeBalance.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeCluster.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeDb.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeDnode.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeFunc.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeMnode.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeOper.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeProfile.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeSdb.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeShow.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeStable.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeSync.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeTelem.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeUser.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeVgroup.c (100%) rename source/dnode/mnode/{ => impl}/src/mnodeWorker.c (100%) rename source/dnode/mnode/{ => impl}/src/mondeInt.c (100%) create mode 100644 source/dnode/mnode/impl/test/mnodeTests.cpp create mode 100644 source/dnode/mnode/sdb/CMakeLists.txt create mode 100644 source/dnode/mnode/sdb/src/sdb.c create mode 100644 source/dnode/mnode/transaction/CMakeLists.txt create mode 100644 source/dnode/mnode/transaction/src/trn.c diff --git a/include/server/mnode/mnode.h b/include/dnode/mnode/mnode.h similarity index 100% rename from include/server/mnode/mnode.h rename to include/dnode/mnode/mnode.h diff --git a/source/dnode/mnode/test/mnodeTests.cpp b/include/dnode/mnode/sdb/sdb.h similarity index 100% rename from source/dnode/mnode/test/mnodeTests.cpp rename to include/dnode/mnode/sdb/sdb.h diff --git a/include/dnode/mnode/transaction/trn.h b/include/dnode/mnode/transaction/trn.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/include/server/qnode/qnode.h b/include/dnode/qnode/qnode.h similarity index 100% rename from include/server/qnode/qnode.h rename to include/dnode/qnode/qnode.h diff --git a/include/server/vnode/meta/meta.h b/include/dnode/vnode/meta/meta.h similarity index 100% rename from include/server/vnode/meta/meta.h rename to include/dnode/vnode/meta/meta.h diff --git a/include/server/vnode/tq/tq.h b/include/dnode/vnode/tq/tq.h similarity index 100% rename from include/server/vnode/tq/tq.h rename to include/dnode/vnode/tq/tq.h diff --git a/include/server/vnode/tsdb/impl/tsdbImpl.h b/include/dnode/vnode/tsdb/impl/tsdbImpl.h similarity index 100% rename from include/server/vnode/tsdb/impl/tsdbImpl.h rename to include/dnode/vnode/tsdb/impl/tsdbImpl.h diff --git a/include/server/vnode/tsdb/tsdb.h b/include/dnode/vnode/tsdb/tsdb.h similarity index 100% rename from include/server/vnode/tsdb/tsdb.h rename to include/dnode/vnode/tsdb/tsdb.h diff --git a/include/server/vnode/vnode.h b/include/dnode/vnode/vnode.h similarity index 100% rename from include/server/vnode/vnode.h rename to include/dnode/vnode/vnode.h diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt index 74ee422bb0..194c317991 100644 --- a/source/dnode/mgmt/CMakeLists.txt +++ b/source/dnode/mgmt/CMakeLists.txt @@ -11,6 +11,6 @@ target_link_libraries( ) target_include_directories( taosd - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/dnode" + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode" private "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) diff --git a/source/dnode/mnode/CMakeLists.txt b/source/dnode/mnode/CMakeLists.txt index bf35b381af..6de5f06476 100644 --- a/source/dnode/mnode/CMakeLists.txt +++ b/source/dnode/mnode/CMakeLists.txt @@ -1,12 +1,3 @@ -aux_source_directory(src MNODE_SRC) -add_library(mnode ${MNODE_SRC}) -target_include_directories( - mnode - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/mnode" - private "${CMAKE_CURRENT_SOURCE_DIR}/inc" -) -target_link_libraries( - mnode - PUBLIC transport - PUBLIC cjson -) \ No newline at end of file +add_subdirectory(impl) +add_subdirectory(sdb) +add_subdirectory(transaction) diff --git a/source/dnode/mnode/impl/CMakeLists.txt b/source/dnode/mnode/impl/CMakeLists.txt new file mode 100644 index 0000000000..7c9e33c5b5 --- /dev/null +++ b/source/dnode/mnode/impl/CMakeLists.txt @@ -0,0 +1,12 @@ +aux_source_directory(src MNODE_SRC) +add_library(mnode ${MNODE_SRC}) +target_include_directories( + mnode + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mnode" + private "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) +target_link_libraries( + mnode + PUBLIC transport + PUBLIC cjson +) \ No newline at end of file diff --git a/source/dnode/mnode/inc/mnodeAcct.h b/source/dnode/mnode/impl/inc/mnodeAcct.h similarity index 100% rename from source/dnode/mnode/inc/mnodeAcct.h rename to source/dnode/mnode/impl/inc/mnodeAcct.h diff --git a/source/dnode/mnode/inc/mnodeAuth.h b/source/dnode/mnode/impl/inc/mnodeAuth.h similarity index 100% rename from source/dnode/mnode/inc/mnodeAuth.h rename to source/dnode/mnode/impl/inc/mnodeAuth.h diff --git a/source/dnode/mnode/inc/mnodeBalance.h b/source/dnode/mnode/impl/inc/mnodeBalance.h similarity index 100% rename from source/dnode/mnode/inc/mnodeBalance.h rename to source/dnode/mnode/impl/inc/mnodeBalance.h diff --git a/source/dnode/mnode/inc/mnodeCluster.h b/source/dnode/mnode/impl/inc/mnodeCluster.h similarity index 100% rename from source/dnode/mnode/inc/mnodeCluster.h rename to source/dnode/mnode/impl/inc/mnodeCluster.h diff --git a/source/dnode/mnode/inc/mnodeDb.h b/source/dnode/mnode/impl/inc/mnodeDb.h similarity index 100% rename from source/dnode/mnode/inc/mnodeDb.h rename to source/dnode/mnode/impl/inc/mnodeDb.h diff --git a/source/dnode/mnode/inc/mnodeDef.h b/source/dnode/mnode/impl/inc/mnodeDef.h similarity index 100% rename from source/dnode/mnode/inc/mnodeDef.h rename to source/dnode/mnode/impl/inc/mnodeDef.h diff --git a/source/dnode/mnode/inc/mnodeDnode.h b/source/dnode/mnode/impl/inc/mnodeDnode.h similarity index 100% rename from source/dnode/mnode/inc/mnodeDnode.h rename to source/dnode/mnode/impl/inc/mnodeDnode.h diff --git a/source/dnode/mnode/inc/mnodeFunc.h b/source/dnode/mnode/impl/inc/mnodeFunc.h similarity index 100% rename from source/dnode/mnode/inc/mnodeFunc.h rename to source/dnode/mnode/impl/inc/mnodeFunc.h diff --git a/source/dnode/mnode/inc/mnodeInt.h b/source/dnode/mnode/impl/inc/mnodeInt.h similarity index 100% rename from source/dnode/mnode/inc/mnodeInt.h rename to source/dnode/mnode/impl/inc/mnodeInt.h diff --git a/source/dnode/mnode/inc/mnodeMnode.h b/source/dnode/mnode/impl/inc/mnodeMnode.h similarity index 100% rename from source/dnode/mnode/inc/mnodeMnode.h rename to source/dnode/mnode/impl/inc/mnodeMnode.h diff --git a/source/dnode/mnode/inc/mnodeOper.h b/source/dnode/mnode/impl/inc/mnodeOper.h similarity index 100% rename from source/dnode/mnode/inc/mnodeOper.h rename to source/dnode/mnode/impl/inc/mnodeOper.h diff --git a/source/dnode/mnode/inc/mnodeProfile.h b/source/dnode/mnode/impl/inc/mnodeProfile.h similarity index 100% rename from source/dnode/mnode/inc/mnodeProfile.h rename to source/dnode/mnode/impl/inc/mnodeProfile.h diff --git a/source/dnode/mnode/inc/mnodeSdb.h b/source/dnode/mnode/impl/inc/mnodeSdb.h similarity index 100% rename from source/dnode/mnode/inc/mnodeSdb.h rename to source/dnode/mnode/impl/inc/mnodeSdb.h diff --git a/source/dnode/mnode/inc/mnodeShow.h b/source/dnode/mnode/impl/inc/mnodeShow.h similarity index 100% rename from source/dnode/mnode/inc/mnodeShow.h rename to source/dnode/mnode/impl/inc/mnodeShow.h diff --git a/source/dnode/mnode/inc/mnodeStable.h b/source/dnode/mnode/impl/inc/mnodeStable.h similarity index 100% rename from source/dnode/mnode/inc/mnodeStable.h rename to source/dnode/mnode/impl/inc/mnodeStable.h diff --git a/source/dnode/mnode/inc/mnodeSync.h b/source/dnode/mnode/impl/inc/mnodeSync.h similarity index 100% rename from source/dnode/mnode/inc/mnodeSync.h rename to source/dnode/mnode/impl/inc/mnodeSync.h diff --git a/source/dnode/mnode/inc/mnodeTelem.h b/source/dnode/mnode/impl/inc/mnodeTelem.h similarity index 100% rename from source/dnode/mnode/inc/mnodeTelem.h rename to source/dnode/mnode/impl/inc/mnodeTelem.h diff --git a/source/dnode/mnode/inc/mnodeUser.h b/source/dnode/mnode/impl/inc/mnodeUser.h similarity index 100% rename from source/dnode/mnode/inc/mnodeUser.h rename to source/dnode/mnode/impl/inc/mnodeUser.h diff --git a/source/dnode/mnode/inc/mnodeVgroup.h b/source/dnode/mnode/impl/inc/mnodeVgroup.h similarity index 100% rename from source/dnode/mnode/inc/mnodeVgroup.h rename to source/dnode/mnode/impl/inc/mnodeVgroup.h diff --git a/source/dnode/mnode/inc/mnodeWorker.h b/source/dnode/mnode/impl/inc/mnodeWorker.h similarity index 100% rename from source/dnode/mnode/inc/mnodeWorker.h rename to source/dnode/mnode/impl/inc/mnodeWorker.h diff --git a/source/dnode/mnode/src/mnodeAcct.c b/source/dnode/mnode/impl/src/mnodeAcct.c similarity index 100% rename from source/dnode/mnode/src/mnodeAcct.c rename to source/dnode/mnode/impl/src/mnodeAcct.c diff --git a/source/dnode/mnode/src/mnodeAuth.c b/source/dnode/mnode/impl/src/mnodeAuth.c similarity index 100% rename from source/dnode/mnode/src/mnodeAuth.c rename to source/dnode/mnode/impl/src/mnodeAuth.c diff --git a/source/dnode/mnode/src/mnodeBalance.c b/source/dnode/mnode/impl/src/mnodeBalance.c similarity index 100% rename from source/dnode/mnode/src/mnodeBalance.c rename to source/dnode/mnode/impl/src/mnodeBalance.c diff --git a/source/dnode/mnode/src/mnodeCluster.c b/source/dnode/mnode/impl/src/mnodeCluster.c similarity index 100% rename from source/dnode/mnode/src/mnodeCluster.c rename to source/dnode/mnode/impl/src/mnodeCluster.c diff --git a/source/dnode/mnode/src/mnodeDb.c b/source/dnode/mnode/impl/src/mnodeDb.c similarity index 100% rename from source/dnode/mnode/src/mnodeDb.c rename to source/dnode/mnode/impl/src/mnodeDb.c diff --git a/source/dnode/mnode/src/mnodeDnode.c b/source/dnode/mnode/impl/src/mnodeDnode.c similarity index 100% rename from source/dnode/mnode/src/mnodeDnode.c rename to source/dnode/mnode/impl/src/mnodeDnode.c diff --git a/source/dnode/mnode/src/mnodeFunc.c b/source/dnode/mnode/impl/src/mnodeFunc.c similarity index 100% rename from source/dnode/mnode/src/mnodeFunc.c rename to source/dnode/mnode/impl/src/mnodeFunc.c diff --git a/source/dnode/mnode/src/mnodeMnode.c b/source/dnode/mnode/impl/src/mnodeMnode.c similarity index 100% rename from source/dnode/mnode/src/mnodeMnode.c rename to source/dnode/mnode/impl/src/mnodeMnode.c diff --git a/source/dnode/mnode/src/mnodeOper.c b/source/dnode/mnode/impl/src/mnodeOper.c similarity index 100% rename from source/dnode/mnode/src/mnodeOper.c rename to source/dnode/mnode/impl/src/mnodeOper.c diff --git a/source/dnode/mnode/src/mnodeProfile.c b/source/dnode/mnode/impl/src/mnodeProfile.c similarity index 100% rename from source/dnode/mnode/src/mnodeProfile.c rename to source/dnode/mnode/impl/src/mnodeProfile.c diff --git a/source/dnode/mnode/src/mnodeSdb.c b/source/dnode/mnode/impl/src/mnodeSdb.c similarity index 100% rename from source/dnode/mnode/src/mnodeSdb.c rename to source/dnode/mnode/impl/src/mnodeSdb.c diff --git a/source/dnode/mnode/src/mnodeShow.c b/source/dnode/mnode/impl/src/mnodeShow.c similarity index 100% rename from source/dnode/mnode/src/mnodeShow.c rename to source/dnode/mnode/impl/src/mnodeShow.c diff --git a/source/dnode/mnode/src/mnodeStable.c b/source/dnode/mnode/impl/src/mnodeStable.c similarity index 100% rename from source/dnode/mnode/src/mnodeStable.c rename to source/dnode/mnode/impl/src/mnodeStable.c diff --git a/source/dnode/mnode/src/mnodeSync.c b/source/dnode/mnode/impl/src/mnodeSync.c similarity index 100% rename from source/dnode/mnode/src/mnodeSync.c rename to source/dnode/mnode/impl/src/mnodeSync.c diff --git a/source/dnode/mnode/src/mnodeTelem.c b/source/dnode/mnode/impl/src/mnodeTelem.c similarity index 100% rename from source/dnode/mnode/src/mnodeTelem.c rename to source/dnode/mnode/impl/src/mnodeTelem.c diff --git a/source/dnode/mnode/src/mnodeUser.c b/source/dnode/mnode/impl/src/mnodeUser.c similarity index 100% rename from source/dnode/mnode/src/mnodeUser.c rename to source/dnode/mnode/impl/src/mnodeUser.c diff --git a/source/dnode/mnode/src/mnodeVgroup.c b/source/dnode/mnode/impl/src/mnodeVgroup.c similarity index 100% rename from source/dnode/mnode/src/mnodeVgroup.c rename to source/dnode/mnode/impl/src/mnodeVgroup.c diff --git a/source/dnode/mnode/src/mnodeWorker.c b/source/dnode/mnode/impl/src/mnodeWorker.c similarity index 100% rename from source/dnode/mnode/src/mnodeWorker.c rename to source/dnode/mnode/impl/src/mnodeWorker.c diff --git a/source/dnode/mnode/src/mondeInt.c b/source/dnode/mnode/impl/src/mondeInt.c similarity index 100% rename from source/dnode/mnode/src/mondeInt.c rename to source/dnode/mnode/impl/src/mondeInt.c diff --git a/source/dnode/mnode/impl/test/mnodeTests.cpp b/source/dnode/mnode/impl/test/mnodeTests.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source/dnode/mnode/sdb/CMakeLists.txt b/source/dnode/mnode/sdb/CMakeLists.txt new file mode 100644 index 0000000000..a441e38118 --- /dev/null +++ b/source/dnode/mnode/sdb/CMakeLists.txt @@ -0,0 +1,11 @@ +aux_source_directory(src MNODE_SRC) +add_library(sdb ${MNODE_SRC}) +target_include_directories( + sdb + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mnode/sdb/inc" + private "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) +target_link_libraries( + sdb + PUBLIC transport +) \ No newline at end of file diff --git a/source/dnode/mnode/sdb/src/sdb.c b/source/dnode/mnode/sdb/src/sdb.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source/dnode/mnode/transaction/CMakeLists.txt b/source/dnode/mnode/transaction/CMakeLists.txt new file mode 100644 index 0000000000..59be0528e4 --- /dev/null +++ b/source/dnode/mnode/transaction/CMakeLists.txt @@ -0,0 +1,11 @@ +aux_source_directory(src MNODE_SRC) +add_library(transaction ${MNODE_SRC}) +target_include_directories( + transaction + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mnode/transaction/inc" + private "${CMAKE_CURRENT_SOURCE_DIR}/inc" +) +target_link_libraries( + transaction + PUBLIC transport +) \ No newline at end of file diff --git a/source/dnode/mnode/transaction/src/trn.c b/source/dnode/mnode/transaction/src/trn.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/source/dnode/qnode/CMakeLists.txt b/source/dnode/qnode/CMakeLists.txt index 4d4e764d41..d9f932a631 100644 --- a/source/dnode/qnode/CMakeLists.txt +++ b/source/dnode/qnode/CMakeLists.txt @@ -2,6 +2,6 @@ aux_source_directory(src QNODE_SRC) add_library(qnode ${QNODE_SRC}) target_include_directories( qnode - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/qnode" + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/qnode" private "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) \ No newline at end of file diff --git a/source/dnode/vnode/impl/CMakeLists.txt b/source/dnode/vnode/impl/CMakeLists.txt index 81744df79c..75e6e822bb 100644 --- a/source/dnode/vnode/impl/CMakeLists.txt +++ b/source/dnode/vnode/impl/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(src VNODE_SRC) add_library(vnode STATIC ${VNODE_SRC}) target_include_directories( vnode - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/vnode" + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode" private "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) target_link_libraries( diff --git a/source/dnode/vnode/meta/CMakeLists.txt b/source/dnode/vnode/meta/CMakeLists.txt index 0de78074ee..8d37f5842e 100644 --- a/source/dnode/vnode/meta/CMakeLists.txt +++ b/source/dnode/vnode/meta/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(src META_SRC) add_library(meta STATIC ${META_SRC}) target_include_directories( meta - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/vnode/meta" + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode/meta" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) target_link_libraries( diff --git a/source/dnode/vnode/meta/test/CMakeLists.txt b/source/dnode/vnode/meta/test/CMakeLists.txt index b37ba6abd4..095a78383c 100644 --- a/source/dnode/vnode/meta/test/CMakeLists.txt +++ b/source/dnode/vnode/meta/test/CMakeLists.txt @@ -7,7 +7,7 @@ target_sources(metaTest ) target_include_directories(metaTest PUBLIC - "${CMAKE_SOURCE_DIR}/include/server/vnode/meta" + "${CMAKE_SOURCE_DIR}/include/dnode/vnode/meta" "${CMAKE_CURRENT_SOURCE_DIR}/../inc" ) target_link_libraries(metaTest diff --git a/source/dnode/vnode/tq/CMakeLists.txt b/source/dnode/vnode/tq/CMakeLists.txt index 441fe46244..205082ed2d 100644 --- a/source/dnode/vnode/tq/CMakeLists.txt +++ b/source/dnode/vnode/tq/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(src TQ_SRC) add_library(tq ${TQ_SRC}) target_include_directories( tq - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/vnode/tq" + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode/tq" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) diff --git a/source/dnode/vnode/tsdb/CMakeLists.txt b/source/dnode/vnode/tsdb/CMakeLists.txt index 339971431b..870d75cd20 100644 --- a/source/dnode/vnode/tsdb/CMakeLists.txt +++ b/source/dnode/vnode/tsdb/CMakeLists.txt @@ -2,7 +2,7 @@ aux_source_directory(src TSDB_SRC) add_library(tsdb ${TSDB_SRC}) target_include_directories( tsdb - PUBLIC "${CMAKE_SOURCE_DIR}/include/server/vnode/tsdb" + PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode/tsdb" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" ) target_link_libraries(