Merge pull request #10257 from taosdata/feature/3.0_wxy

TD-13338 SELECT statement translate code
2022-02-15 10:41:58 +08:00 · 2022-02-15 10:41:58 +08:00 · 2c395cf02d
parent 028496a18a 721dec7dcc
commit 2c395cf02d
13 changed files with 3 additions and 3 deletions
--- a/include/libs/nodes/nodes.h
+++ b/include/libs/nodes/nodes.h
--- a/include/libs/nodes/nodesShowStmts.h
+++ b/include/libs/nodes/nodesShowStmts.h
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@ -3,5 +3,4 @@ add_subdirectory(util)
 add_subdirectory(common)
 add_subdirectory(libs)
 add_subdirectory(client)
-add_subdirectory(dnode)
-add_subdirectory(nodes)
+add_subdirectory(dnode)
--- a/source/libs/CMakeLists.txt
+++ b/source/libs/CMakeLists.txt
@ -13,3 +13,4 @@ add_subdirectory(function)
 add_subdirectory(qcom)
 add_subdirectory(qworker)
 add_subdirectory(tfs)
+add_subdirectory(nodes)
--- a/source/libs/nodes/CMakeLists.txt
+++ b/source/libs/nodes/CMakeLists.txt
@ -2,7 +2,7 @@ aux_source_directory(src NODES_SRC)
 add_library(nodes STATIC ${NODES_SRC})
 target_include_directories(
    nodes
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/nodes"
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/nodes"
    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
 target_link_libraries(
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
--- a/source/libs/nodes/src/nodesEqualFuncs.c
+++ b/source/libs/nodes/src/nodesEqualFuncs.c
--- a/source/libs/nodes/src/nodesTraverseFuncs.c
+++ b/source/libs/nodes/src/nodesTraverseFuncs.c
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
--- a/source/libs/nodes/test/CMakeLists.txt
+++ b/source/libs/nodes/test/CMakeLists.txt
--- a/source/libs/nodes/test/nodesTest.cpp
+++ b/source/libs/nodes/test/nodesTest.cpp