Mote YT plugin to ydb/library/yql

ydb-platform · Dec 19, 2023 · 222d332 · 222d332
1 parent cbc404b
commit 222d332
Show file tree

Hide file tree

Showing 38 changed files with 35 additions and 407 deletions.
diff --git a/ydb/library/yql/ya.make b/ydb/library/yql/ya.make
@@ -12,4 +12,5 @@ RECURSE(
     tools
     udfs
     utils
+    yt
 )
diff --git a/ydb/library/yql/yt/README.md b/ydb/library/yql/yt/README.md
@@ -0,0 +1,15 @@
+### What is this?
+
+This directory contains targets related to YTsaurus YQL plugin. [YTsaurus](https://github.com/ytsaurus/ytsaurus)
+is an open-source big data storage system which employs YQL engine as one of its primary computation engines.
+YT relies on a so-called YQL plugin shared library, which is built from target located in dynamic/ directory.
+
+Changes of interfaces in this directory must be done very carefuly. In general, bridge/interface.h must be a
+superset of 
+[ytsaurus:yt/yql/plugin/bridge/interface.h](https://github.com/ytsaurus/ytsaurus/blob/main/yt/yql/plugin/bridge/interface.h).
+If a backwards incompatible change in interface is required, do not forget to promote the YQL plugin version
+in this repository, and change the min/max supported YQL plugin 
+[versions](https://github.com/ytsaurus/ytsaurus/blob/main/yt/yql/plugin/bridge/plugin.cpp#L32-L41) in YTsaurus repository.
+
+If you are not 100% sure about what you are doing, contact vvvv@ydb.tech and mpereskokova@ytsaurus.tech for help.
+
diff --git a/yt/yql/plugin/bridge/interface.h → ydb/library/yql/yt/bridge/interface.h b/yt/yql/plugin/bridge/interface.h → ydb/library/yql/yt/bridge/interface.h
diff --git a/...lugin/dynamic/CMakeLists.darwin-arm64.txt → ...ql/yt/dynamic/CMakeLists.darwin-arm64.txt b/...lugin/dynamic/CMakeLists.darwin-arm64.txt → ...ql/yt/dynamic/CMakeLists.darwin-arm64.txt
diff --git a/...ugin/dynamic/CMakeLists.darwin-x86_64.txt → ...l/yt/dynamic/CMakeLists.darwin-x86_64.txt b/...ugin/dynamic/CMakeLists.darwin-x86_64.txt → ...l/yt/dynamic/CMakeLists.darwin-x86_64.txt
diff --git a/...ugin/dynamic/CMakeLists.linux-aarch64.txt → ...l/yt/dynamic/CMakeLists.linux-aarch64.txt b/...ugin/dynamic/CMakeLists.linux-aarch64.txt → ...l/yt/dynamic/CMakeLists.linux-aarch64.txt
diff --git a/...lugin/dynamic/CMakeLists.linux-x86_64.txt → ...ql/yt/dynamic/CMakeLists.linux-x86_64.txt b/...lugin/dynamic/CMakeLists.linux-x86_64.txt → ...ql/yt/dynamic/CMakeLists.linux-x86_64.txt
diff --git a/yt/yql/plugin/CMakeLists.txt → ydb/library/yql/yt/dynamic/CMakeLists.txt b/yt/yql/plugin/CMakeLists.txt → ydb/library/yql/yt/dynamic/CMakeLists.txt
diff --git a/...gin/dynamic/CMakeLists.windows-x86_64.txt → .../yt/dynamic/CMakeLists.windows-x86_64.txt b/...gin/dynamic/CMakeLists.windows-x86_64.txt → .../yt/dynamic/CMakeLists.windows-x86_64.txt
diff --git a/yt/yql/plugin/dynamic/dylib.exports → ydb/library/yql/yt/dynamic/dylib.exports b/yt/yql/plugin/dynamic/dylib.exports → ydb/library/yql/yt/dynamic/dylib.exports
diff --git a/yt/yql/plugin/dynamic/impl.cpp → ydb/library/yql/yt/dynamic/impl.cpp b/yt/yql/plugin/dynamic/impl.cpp → ydb/library/yql/yt/dynamic/impl.cpp
@@ -1,5 +1,5 @@
-#include <yt/yql/plugin/bridge/interface.h>
-#include <yt/yql/plugin/native/plugin.h>
+#include <ydb/library/yql/yt/bridge/interface.h>
+#include <ydb/library/yql/yt/native/plugin.h>
 
 #include <type_traits>
 

diff --git a/yt/yql/plugin/dynamic/ya.make → ydb/library/yql/yt/dynamic/ya.make b/yt/yql/plugin/dynamic/ya.make → ydb/library/yql/yt/dynamic/ya.make
@@ -9,7 +9,7 @@ SRCS(
 )
 
 PEERDIR(
-    yt/yql/plugin/native
+    ydb/library/yql/yt/native
 )
 
 END()
diff --git a/...plugin/native/CMakeLists.darwin-arm64.txt → ...yql/yt/native/CMakeLists.darwin-arm64.txt b/...plugin/native/CMakeLists.darwin-arm64.txt → ...yql/yt/native/CMakeLists.darwin-arm64.txt
diff --git a/...lugin/native/CMakeLists.darwin-x86_64.txt → ...ql/yt/native/CMakeLists.darwin-x86_64.txt b/...lugin/native/CMakeLists.darwin-x86_64.txt → ...ql/yt/native/CMakeLists.darwin-x86_64.txt
diff --git a/...lugin/native/CMakeLists.linux-aarch64.txt → ...ql/yt/native/CMakeLists.linux-aarch64.txt b/...lugin/native/CMakeLists.linux-aarch64.txt → ...ql/yt/native/CMakeLists.linux-aarch64.txt
diff --git a/...plugin/native/CMakeLists.linux-x86_64.txt → ...yql/yt/native/CMakeLists.linux-x86_64.txt b/...plugin/native/CMakeLists.linux-x86_64.txt → ...yql/yt/native/CMakeLists.linux-x86_64.txt
diff --git a/yt/yql/plugin/dynamic/CMakeLists.txt → ydb/library/yql/yt/native/CMakeLists.txt b/yt/yql/plugin/dynamic/CMakeLists.txt → ydb/library/yql/yt/native/CMakeLists.txt
diff --git a/...ugin/native/CMakeLists.windows-x86_64.txt → ...l/yt/native/CMakeLists.windows-x86_64.txt b/...ugin/native/CMakeLists.windows-x86_64.txt → ...l/yt/native/CMakeLists.windows-x86_64.txt
diff --git a/yt/yql/plugin/native/error_helpers.cpp → ydb/library/yql/yt/native/error_helpers.cpp b/yt/yql/plugin/native/error_helpers.cpp → ydb/library/yql/yt/native/error_helpers.cpp
diff --git a/yt/yql/plugin/native/error_helpers.h → ydb/library/yql/yt/native/error_helpers.h b/yt/yql/plugin/native/error_helpers.h → ydb/library/yql/yt/native/error_helpers.h
diff --git a/yt/yql/plugin/native/plugin.cpp → ydb/library/yql/yt/native/plugin.cpp b/yt/yql/plugin/native/plugin.cpp → ydb/library/yql/yt/native/plugin.cpp
diff --git a/yt/yql/plugin/native/plugin.h → ydb/library/yql/yt/native/plugin.h b/yt/yql/plugin/native/plugin.h → ydb/library/yql/yt/native/plugin.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <yt/yql/plugin/plugin.h>
+#include <ydb/library/yql/yt/plugin.h>
 
 namespace NYT::NYqlPlugin {
 

diff --git a/yt/yql/plugin/native/progress_merger.cpp → ...library/yql/yt/native/progress_merger.cpp b/yt/yql/plugin/native/progress_merger.cpp → ...library/yql/yt/native/progress_merger.cpp
@@ -1,6 +1,5 @@
 #include "progress_merger.h"
 
-
 namespace NYT::NYqlPlugin {
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/yt/yql/plugin/native/progress_merger.h → ydb/library/yql/yt/native/progress_merger.h b/yt/yql/plugin/native/progress_merger.h → ydb/library/yql/yt/native/progress_merger.h
diff --git a/yt/yql/plugin/native/ya.make → ydb/library/yql/yt/native/ya.make b/yt/yql/plugin/native/ya.make → ydb/library/yql/yt/native/ya.make
@@ -40,7 +40,7 @@ PEERDIR(
     ydb/library/yql/providers/yt/lib/yt_download
     ydb/library/yql/providers/yt/provider
 
-    yt/yql/plugin
+    ydb/library/yql/yt
 )
 
 YQL_LAST_ABI_VERSION()

diff --git a/yt/yql/plugin/plugin.cpp → ydb/library/yql/yt/plugin.cpp b/yt/yql/plugin/plugin.cpp → ydb/library/yql/yt/plugin.cpp
diff --git a/yt/yql/plugin/plugin.h → ydb/library/yql/yt/plugin.h b/yt/yql/plugin/plugin.h → ydb/library/yql/yt/plugin.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <yt/yql/plugin/bridge/interface.h>
+#include <ydb/library/yql/yt/bridge/interface.h>
 
 #include <library/cpp/logger/log.h>
 

diff --git a/ydb/library/yql/yt/ya.make b/ydb/library/yql/yt/ya.make
@@ -0,0 +1,13 @@
+LIBRARY()
+
+SRCS(
+    plugin.cpp
+)
+
+END()
+
+RECURSE(
+    dynamic
+    native
+)
+
diff --git a/yt/yql/plugin/CMakeLists.darwin-arm64.txt b/yt/yql/plugin/CMakeLists.darwin-arm64.txt
diff --git a/yt/yql/plugin/CMakeLists.darwin-x86_64.txt b/yt/yql/plugin/CMakeLists.darwin-x86_64.txt
diff --git a/yt/yql/plugin/CMakeLists.linux-aarch64.txt b/yt/yql/plugin/CMakeLists.linux-aarch64.txt
diff --git a/yt/yql/plugin/CMakeLists.linux-x86_64.txt b/yt/yql/plugin/CMakeLists.linux-x86_64.txt
diff --git a/yt/yql/plugin/CMakeLists.windows-x86_64.txt b/yt/yql/plugin/CMakeLists.windows-x86_64.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,5 @@ RECURSE( @@
         tools
         udfs
         utils
+        yt
     )