From 8469098bc9da6e4c1fd2eab3b6c351c927fffeef Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 29 Mar 2022 19:09:38 +0800
Subject: [PATCH] rename files

---
 source/dnode/mgmt/CMakeLists.txt                   | 14 +++++++++-----
 source/dnode/mgmt/main/{src => exe}/dndMain.c      |  0
 source/dnode/mgmt/{container => main}/inc/dnd.h    |  0
 source/dnode/mgmt/{container => main}/inc/dndInt.h |  0
 .../dnode/mgmt/{container => main}/src/dndExec.c   |  0
 .../dnode/mgmt/{container => main}/src/dndFile.c   |  0
 source/dnode/mgmt/{container => main}/src/dndInt.c |  0
 .../mgmt/{container => main}/src/dndMonitor.c      |  0
 source/dnode/mgmt/{container => main}/src/dndMsg.c |  0
 source/dnode/mgmt/{container => main}/src/dndObj.c |  0
 .../mgmt/{container => main}/src/dndTransport.c    |  0
 11 files changed, 9 insertions(+), 5 deletions(-)
 rename source/dnode/mgmt/main/{src => exe}/dndMain.c (100%)
 rename source/dnode/mgmt/{container => main}/inc/dnd.h (100%)
 rename source/dnode/mgmt/{container => main}/inc/dndInt.h (100%)
 rename source/dnode/mgmt/{container => main}/src/dndExec.c (100%)
 rename source/dnode/mgmt/{container => main}/src/dndFile.c (100%)
 rename source/dnode/mgmt/{container => main}/src/dndInt.c (100%)
 rename source/dnode/mgmt/{container => main}/src/dndMonitor.c (100%)
 rename source/dnode/mgmt/{container => main}/src/dndMsg.c (100%)
 rename source/dnode/mgmt/{container => main}/src/dndObj.c (100%)
 rename source/dnode/mgmt/{container => main}/src/dndTransport.c (100%)

diff --git a/source/dnode/mgmt/CMakeLists.txt b/source/dnode/mgmt/CMakeLists.txt
index 35ea166983..6a93aaf6dd 100644
--- a/source/dnode/mgmt/CMakeLists.txt
+++ b/source/dnode/mgmt/CMakeLists.txt
@@ -1,12 +1,10 @@
-aux_source_directory(src DNODE_SRC)
 aux_source_directory(dnode/src DNODE_SRC)
 aux_source_directory(qnode/src DNODE_SRC)
 aux_source_directory(bnode/src DNODE_SRC)
 aux_source_directory(snode/src DNODE_SRC)
 aux_source_directory(vnode/src DNODE_SRC)
 aux_source_directory(mnode/src DNODE_SRC)
-aux_source_directory(container/src DNODE_SRC)
-
+aux_source_directory(main/src DNODE_SRC)
 add_library(dnode STATIC ${DNODE_SRC})
 target_link_libraries(
     dnode cjson mnode vnode qnode snode bnode wal sync taos tfs monitor
@@ -20,10 +18,16 @@ target_include_directories(
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/snode/inc"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/vnode/inc"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/mnode/inc"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/container/inc"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/main/inc"
 )
 
-add_subdirectory(main)
+aux_source_directory(main/exe EXEC_SRC)
+add_executable(taosd ${EXEC_SRC})
+target_include_directories(
+    taosd
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/main/inc"
+)
+target_link_libraries(taosd dnode)
 
 if(${BUILD_TEST})
     add_subdirectory(test)
diff --git a/source/dnode/mgmt/main/src/dndMain.c b/source/dnode/mgmt/main/exe/dndMain.c
similarity index 100%
rename from source/dnode/mgmt/main/src/dndMain.c
rename to source/dnode/mgmt/main/exe/dndMain.c
diff --git a/source/dnode/mgmt/container/inc/dnd.h b/source/dnode/mgmt/main/inc/dnd.h
similarity index 100%
rename from source/dnode/mgmt/container/inc/dnd.h
rename to source/dnode/mgmt/main/inc/dnd.h
diff --git a/source/dnode/mgmt/container/inc/dndInt.h b/source/dnode/mgmt/main/inc/dndInt.h
similarity index 100%
rename from source/dnode/mgmt/container/inc/dndInt.h
rename to source/dnode/mgmt/main/inc/dndInt.h
diff --git a/source/dnode/mgmt/container/src/dndExec.c b/source/dnode/mgmt/main/src/dndExec.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndExec.c
rename to source/dnode/mgmt/main/src/dndExec.c
diff --git a/source/dnode/mgmt/container/src/dndFile.c b/source/dnode/mgmt/main/src/dndFile.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndFile.c
rename to source/dnode/mgmt/main/src/dndFile.c
diff --git a/source/dnode/mgmt/container/src/dndInt.c b/source/dnode/mgmt/main/src/dndInt.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndInt.c
rename to source/dnode/mgmt/main/src/dndInt.c
diff --git a/source/dnode/mgmt/container/src/dndMonitor.c b/source/dnode/mgmt/main/src/dndMonitor.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndMonitor.c
rename to source/dnode/mgmt/main/src/dndMonitor.c
diff --git a/source/dnode/mgmt/container/src/dndMsg.c b/source/dnode/mgmt/main/src/dndMsg.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndMsg.c
rename to source/dnode/mgmt/main/src/dndMsg.c
diff --git a/source/dnode/mgmt/container/src/dndObj.c b/source/dnode/mgmt/main/src/dndObj.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndObj.c
rename to source/dnode/mgmt/main/src/dndObj.c
diff --git a/source/dnode/mgmt/container/src/dndTransport.c b/source/dnode/mgmt/main/src/dndTransport.c
similarity index 100%
rename from source/dnode/mgmt/container/src/dndTransport.c
rename to source/dnode/mgmt/main/src/dndTransport.c