From 851ebaac3e1485f0f3c9abe357e68baa2e197282 Mon Sep 17 00:00:00 2001 From: slguan Date: Sun, 5 Apr 2020 09:46:51 +0800 Subject: [PATCH] refactor code directory --- src/dnode/CMakeLists.txt | 2 +- src/{dnode => }/inc/vnode.h | 0 src/mnode/src/mgmtShell.c | 1 + src/vnode/CMakeLists.txt | 1 + src/vnode/main/CMakeLists.txt | 18 ++++++++++++ src/{dnode => vnode/main}/inc/vnodeInt.h | 0 src/{dnode => vnode/main}/src/vnodeMain.c | 0 src/{dnode => vnode/main}/src/vnodeWrite.c | 0 tests/script/general/table/basic1.sim | 4 +++ tests/script/general/table/basic2.sim | 3 ++ tests/script/unique/dnodes/basic1.sim | 33 ++++++++++++++++++++++ 11 files changed, 61 insertions(+), 1 deletion(-) rename src/{dnode => }/inc/vnode.h (100%) create mode 100644 src/vnode/main/CMakeLists.txt rename src/{dnode => vnode/main}/inc/vnodeInt.h (100%) rename src/{dnode => vnode/main}/src/vnodeMain.c (100%) rename src/{dnode => vnode/main}/src/vnodeWrite.c (100%) create mode 100644 tests/script/unique/dnodes/basic1.sim diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt index 472c270e62..f0be3f9044 100644 --- a/src/dnode/CMakeLists.txt +++ b/src/dnode/CMakeLists.txt @@ -13,7 +13,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) AUX_SOURCE_DIRECTORY(src SRC) ADD_EXECUTABLE(taosd ${SRC}) - TARGET_LINK_LIBRARIES(taosd mnode taos_static monitor http tsdb twal) + TARGET_LINK_LIBRARIES(taosd mnode taos_static monitor http tsdb twal vnode) IF (TD_ACCOUNT) TARGET_LINK_LIBRARIES(taosd account) diff --git a/src/dnode/inc/vnode.h b/src/inc/vnode.h similarity index 100% rename from src/dnode/inc/vnode.h rename to src/inc/vnode.h diff --git a/src/mnode/src/mgmtShell.c b/src/mnode/src/mgmtShell.c index 67b7a72c23..4b2f53f012 100644 --- a/src/mnode/src/mgmtShell.c +++ b/src/mnode/src/mgmtShell.c @@ -136,6 +136,7 @@ static void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) { if (mgmtCheckRedirect(rpcMsg->handle)) { // rpcSendRedirectRsp(rpcMsg->handle, mgmtGetMnodeIpListForRedirect()); + mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NO_MASTER); rpcFreeCont(rpcMsg->pCont); return; } diff --git a/src/vnode/CMakeLists.txt b/src/vnode/CMakeLists.txt index cee8ea3aee..3df980ece1 100644 --- a/src/vnode/CMakeLists.txt +++ b/src/vnode/CMakeLists.txt @@ -3,3 +3,4 @@ PROJECT(TDengine) ADD_SUBDIRECTORY(wal) ADD_SUBDIRECTORY(tsdb) +ADD_SUBDIRECTORY(main) diff --git a/src/vnode/main/CMakeLists.txt b/src/vnode/main/CMakeLists.txt new file mode 100644 index 0000000000..19b1b4c22a --- /dev/null +++ b/src/vnode/main/CMakeLists.txt @@ -0,0 +1,18 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +PROJECT(TDengine) + +IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) + INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/vnode/tsdb/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc) + INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc) + INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc) + INCLUDE_DIRECTORIES(inc) + AUX_SOURCE_DIRECTORY(src SRC) + + ADD_LIBRARY(vnode ${SRC}) + TARGET_LINK_LIBRARIES(vnode tsdb) +ENDIF () \ No newline at end of file diff --git a/src/dnode/inc/vnodeInt.h b/src/vnode/main/inc/vnodeInt.h similarity index 100% rename from src/dnode/inc/vnodeInt.h rename to src/vnode/main/inc/vnodeInt.h diff --git a/src/dnode/src/vnodeMain.c b/src/vnode/main/src/vnodeMain.c similarity index 100% rename from src/dnode/src/vnodeMain.c rename to src/vnode/main/src/vnodeMain.c diff --git a/src/dnode/src/vnodeWrite.c b/src/vnode/main/src/vnodeWrite.c similarity index 100% rename from src/dnode/src/vnodeWrite.c rename to src/vnode/main/src/vnodeWrite.c diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim index 00e11483da..9a05fb6d67 100644 --- a/tests/script/general/table/basic1.sim +++ b/tests/script/general/table/basic1.sim @@ -69,3 +69,7 @@ if $data21 != 3 then return -1 endi +sql drop database d1 + +system sh/exec.sh -n dnode1 -s stop -x SIGINT + diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim index 7701ca1c1f..18b98f4a3f 100644 --- a/tests/script/general/table/basic2.sim +++ b/tests/script/general/table/basic2.sim @@ -64,3 +64,6 @@ if $data21 != 3 then return -1 endi +sql drop database d1 + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/unique/dnodes/basic1.sim b/tests/script/unique/dnodes/basic1.sim new file mode 100644 index 0000000000..a231fc6864 --- /dev/null +++ b/tests/script/unique/dnodes/basic1.sim @@ -0,0 +1,33 @@ +system sh/stop_dnodes.sh +system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/exec_up.sh -n dnode1 -s start +system sh/exec_up.sh -n dnode2 -s start +sql connect + +print =============== show dnodes +sql show dnodes; +if $rows != 1 then + return -1 +endi + +if $data00 != 1 then + return -1 +endi + +if $data01 != 192.168.0.1 then + return -1 +endi + +sql show mnodes; +if $rows != 1 then + return -1 +endi + +if $data00 != 1 then + return -1 +endi + +if $data01 != 192.168.0.1 then + return -1 +endi -- GitLab