Intermediate changes

6 files changed, 17 insertions, 1 deletions

diff --git a/yt/yql/plugin/native/CMakeLists.darwin-x86_64.txt b/yt/yql/plugin/native/CMakeLists.darwin-x86_64.txt
index 7c002160ee..04a6b539a5 100644
--- a/yt/yql/plugin/native/CMakeLists.darwin-x86_64.txt
+++ b/yt/yql/plugin/native/CMakeLists.darwin-x86_64.txt
@@ -20,6 +20,7 @@ target_link_libraries(yql-plugin-native PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
@@ -65,6 +66,7 @@ target_link_libraries(yql-plugin-native.global PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
diff --git a/yt/yql/plugin/native/CMakeLists.linux-aarch64.txt b/yt/yql/plugin/native/CMakeLists.linux-aarch64.txt
index b85008e3c5..b9ac27203c 100644
--- a/yt/yql/plugin/native/CMakeLists.linux-aarch64.txt
+++ b/yt/yql/plugin/native/CMakeLists.linux-aarch64.txt
@@ -21,6 +21,7 @@ target_link_libraries(yql-plugin-native PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
@@ -67,6 +68,7 @@ target_link_libraries(yql-plugin-native.global PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
diff --git a/yt/yql/plugin/native/CMakeLists.linux-x86_64.txt b/yt/yql/plugin/native/CMakeLists.linux-x86_64.txt
index b85008e3c5..b9ac27203c 100644
--- a/yt/yql/plugin/native/CMakeLists.linux-x86_64.txt
+++ b/yt/yql/plugin/native/CMakeLists.linux-x86_64.txt
@@ -21,6 +21,7 @@ target_link_libraries(yql-plugin-native PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
@@ -67,6 +68,7 @@ target_link_libraries(yql-plugin-native.global PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
diff --git a/yt/yql/plugin/native/CMakeLists.windows-x86_64.txt b/yt/yql/plugin/native/CMakeLists.windows-x86_64.txt
index 7c002160ee..04a6b539a5 100644
--- a/yt/yql/plugin/native/CMakeLists.windows-x86_64.txt
+++ b/yt/yql/plugin/native/CMakeLists.windows-x86_64.txt
@@ -20,6 +20,7 @@ target_link_libraries(yql-plugin-native PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
@@ -65,6 +66,7 @@ target_link_libraries(yql-plugin-native.global PUBLIC
   cpp-yson-node
   cpp-mapreduce-client
   cpp-mapreduce-common
+  yt-library-program
   library-yql-ast
   yql-sql-pg
   yql-parser-pg_wrapper
diff --git a/yt/yql/plugin/native/plugin.cpp b/yt/yql/plugin/native/plugin.cpp
index 9bb6c2261e..38ccbbdf3b 100644
--- a/yt/yql/plugin/native/plugin.cpp
+++ b/yt/yql/plugin/native/plugin.cpp
@@ -24,7 +24,11 @@
 #include <ydb/library/yql/utils/log/log.h>
 #include <ydb/library/yql/utils/backtrace/backtrace.h>
 
-#include <yt/cpp/mapreduce/interface/config.h>
+#include <yt/yt/core/ytree/convert.h>
+
+#include <yt/yt/library/program/config.h>
+#include <yt/yt/library/program/helpers.h>
+
 #include <yt/cpp/mapreduce/interface/logging/logger.h>
 
 #include <library/cpp/yt/threading/rw_spin_lock.h>
@@ -115,6 +119,9 @@ public:
     TYqlPlugin(TYqlPluginOptions& options)
     {
         try {
+            auto singletonsConfig = NYTree::ConvertTo<TSingletonsConfigPtr>(options.SingletonsConfig);
+            ConfigureSingletons(singletonsConfig);
+
             NYql::NLog::InitLogger(std::move(options.LogBackend));
 
             auto& logger = NYql::NLog::YqlLogger();
diff --git a/yt/yql/plugin/native/ya.make b/yt/yql/plugin/native/ya.make
index 15f3851411..fe1a657c69 100644
--- a/yt/yql/plugin/native/ya.make
+++ b/yt/yql/plugin/native/ya.make
@@ -13,6 +13,7 @@ PEERDIR(
     library/cpp/yson/node
     yt/cpp/mapreduce/client
     yt/cpp/mapreduce/common
+    yt/yt/library/program
     ydb/library/yql/ast
     ydb/library/yql/sql/pg
     ydb/library/yql/parser/pg_wrapper