Browse Source

Introduce OSS version of control utility for service_node/working_node (dq testing utilities)

aozeritsky 1 year ago
parent
commit
67ad455d45

+ 6 - 4
.mapping.json

@@ -8366,11 +8366,7 @@
   "ydb/library/yql/sql/v1/ut/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/yql/sql/v1/ut/CMakeLists.txt":"",
   "ydb/library/yql/sql/v1/ut/CMakeLists.windows-x86_64.txt":"",
-  "ydb/library/yql/tools/CMakeLists.darwin-x86_64.txt":"",
-  "ydb/library/yql/tools/CMakeLists.linux-aarch64.txt":"",
-  "ydb/library/yql/tools/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/yql/tools/CMakeLists.txt":"",
-  "ydb/library/yql/tools/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/yql/tools/astdiff/CMakeLists.darwin-x86_64.txt":"",
   "ydb/library/yql/tools/astdiff/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/tools/astdiff/CMakeLists.linux-x86_64.txt":"",
@@ -8380,6 +8376,12 @@
   "ydb/library/yql/tools/dq/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/tools/dq/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/yql/tools/dq/CMakeLists.txt":"",
+  "ydb/library/yql/tools/dq/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/yql/tools/dq/dq_cli/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/yql/tools/dq/dq_cli/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/yql/tools/dq/dq_cli/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/yql/tools/dq/dq_cli/CMakeLists.txt":"",
+  "ydb/library/yql/tools/dq/dq_cli/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/yql/tools/dq/service_node/CMakeLists.darwin-x86_64.txt":"",
   "ydb/library/yql/tools/dq/service_node/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/tools/dq/service_node/CMakeLists.linux-x86_64.txt":"",

+ 0 - 15
ydb/library/yql/tools/CMakeLists.darwin-x86_64.txt

@@ -1,15 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(astdiff)
-add_subdirectory(dq)
-add_subdirectory(dqrun)
-add_subdirectory(mrjob)
-add_subdirectory(sql2yql)
-add_subdirectory(sql_formatter)
-add_subdirectory(yqlrun)

+ 0 - 15
ydb/library/yql/tools/CMakeLists.linux-aarch64.txt

@@ -1,15 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(astdiff)
-add_subdirectory(dq)
-add_subdirectory(dqrun)
-add_subdirectory(mrjob)
-add_subdirectory(sql2yql)
-add_subdirectory(sql_formatter)
-add_subdirectory(yqlrun)

+ 0 - 15
ydb/library/yql/tools/CMakeLists.linux-x86_64.txt

@@ -1,15 +0,0 @@
-
-# This file was generated by the build system used internally in the Yandex monorepo.
-# Only simple modifications are allowed (adding source-files to targets, adding simple properties
-# like target_include_directories). These modifications will be ported to original
-# ya.make files by maintainers. Any complex modifications which can't be ported back to the
-# original buildsystem will not be accepted.
-
-
-add_subdirectory(astdiff)
-add_subdirectory(dq)
-add_subdirectory(dqrun)
-add_subdirectory(mrjob)
-add_subdirectory(sql2yql)
-add_subdirectory(sql_formatter)
-add_subdirectory(yqlrun)

+ 7 - 9
ydb/library/yql/tools/CMakeLists.txt

@@ -6,12 +6,10 @@
 # original buildsystem will not be accepted.
 
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-aarch64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-  include(CMakeLists.darwin-x86_64.txt)
-elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
-  include(CMakeLists.windows-x86_64.txt)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
-  include(CMakeLists.linux-x86_64.txt)
-endif()
+add_subdirectory(astdiff)
+add_subdirectory(dq)
+add_subdirectory(dqrun)
+add_subdirectory(mrjob)
+add_subdirectory(sql2yql)
+add_subdirectory(sql_formatter)
+add_subdirectory(yqlrun)

+ 1 - 0
ydb/library/yql/tools/dq/CMakeLists.darwin-x86_64.txt

@@ -6,5 +6,6 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(dq_cli)
 add_subdirectory(service_node)
 add_subdirectory(worker_node)

+ 1 - 0
ydb/library/yql/tools/dq/CMakeLists.linux-aarch64.txt

@@ -6,5 +6,6 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(dq_cli)
 add_subdirectory(service_node)
 add_subdirectory(worker_node)

+ 1 - 0
ydb/library/yql/tools/dq/CMakeLists.linux-x86_64.txt

@@ -6,5 +6,6 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(dq_cli)
 add_subdirectory(service_node)
 add_subdirectory(worker_node)

+ 2 - 0
ydb/library/yql/tools/dq/CMakeLists.txt

@@ -10,6 +10,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarc
   include(CMakeLists.linux-aarch64.txt)
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   include(CMakeLists.darwin-x86_64.txt)
+elseif (WIN32 AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64" AND NOT HAVE_CUDA)
+  include(CMakeLists.windows-x86_64.txt)
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA)
   include(CMakeLists.linux-x86_64.txt)
 endif()

+ 1 - 6
ydb/library/yql/tools/CMakeLists.windows-x86_64.txt → ydb/library/yql/tools/dq/CMakeLists.windows-x86_64.txt

@@ -6,9 +6,4 @@
 # original buildsystem will not be accepted.
 
 
-add_subdirectory(astdiff)
-add_subdirectory(dqrun)
-add_subdirectory(mrjob)
-add_subdirectory(sql2yql)
-add_subdirectory(sql_formatter)
-add_subdirectory(yqlrun)
+add_subdirectory(dq_cli)

Some files were not shown because too many files changed in this diff