Moved protobuf_udf lib

47 files changed, 144 insertions, 329 deletions

diff --git a/.mapping.json b/.mapping.json
index c4c909f0c91..4da05c1d3ac 100644
--- a/.mapping.json
+++ b/.mapping.json
@@ -7206,6 +7206,16 @@
   "ydb/library/yql/minikql/perf/presort/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/yql/minikql/perf/presort/CMakeLists.txt":"",
   "ydb/library/yql/minikql/perf/presort/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/CMakeLists.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/CMakeLists.windows-x86_64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.darwin-x86_64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.linux-aarch64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.linux-x86_64.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.txt":"",
+  "ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/yql/minikql/ut/CMakeLists.darwin-x86_64.txt":"",
   "ydb/library/yql/minikql/ut/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/minikql/ut/CMakeLists.linux-x86_64.txt":"",
@@ -7283,16 +7293,6 @@
   "ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.linux-x86_64.txt":"",
   "ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.txt":"",
   "ydb/library/yql/parser/proto_ast/gen/v1_proto/CMakeLists.windows-x86_64.txt":"",
-  "ydb/library/yql/protobuf_udf/CMakeLists.darwin-x86_64.txt":"",
-  "ydb/library/yql/protobuf_udf/CMakeLists.linux-aarch64.txt":"",
-  "ydb/library/yql/protobuf_udf/CMakeLists.linux-x86_64.txt":"",
-  "ydb/library/yql/protobuf_udf/CMakeLists.txt":"",
-  "ydb/library/yql/protobuf_udf/CMakeLists.windows-x86_64.txt":"",
-  "ydb/library/yql/protobuf_udf/ut/CMakeLists.darwin-x86_64.txt":"",
-  "ydb/library/yql/protobuf_udf/ut/CMakeLists.linux-aarch64.txt":"",
-  "ydb/library/yql/protobuf_udf/ut/CMakeLists.linux-x86_64.txt":"",
-  "ydb/library/yql/protobuf_udf/ut/CMakeLists.txt":"",
-  "ydb/library/yql/protobuf_udf/ut/CMakeLists.windows-x86_64.txt":"",
   "ydb/library/yql/protos/CMakeLists.darwin-x86_64.txt":"",
   "ydb/library/yql/protos/CMakeLists.linux-aarch64.txt":"",
   "ydb/library/yql/protos/CMakeLists.linux-x86_64.txt":"",
@@ -9627,13 +9627,6 @@
   "ydb/tests/tools/idx_test/CMakeLists.linux-x86_64.txt":"",
   "ydb/tests/tools/idx_test/CMakeLists.txt":"",
   "ydb/tests/tools/idx_test/CMakeLists.windows-x86_64.txt":"",
-  "yql/CMakeLists.txt":"",
-  "yql/library/CMakeLists.txt":"",
-  "yql/library/protobuf_udf/CMakeLists.darwin-x86_64.txt":"",
-  "yql/library/protobuf_udf/CMakeLists.linux-aarch64.txt":"",
-  "yql/library/protobuf_udf/CMakeLists.linux-x86_64.txt":"",
-  "yql/library/protobuf_udf/CMakeLists.txt":"",
-  "yql/library/protobuf_udf/CMakeLists.windows-x86_64.txt":"",
   "yt/CMakeLists.txt":"",
   "yt/cpp/CMakeLists.txt":"",
   "yt/cpp/mapreduce/CMakeLists.txt":"",
diff --git a/CMakeLists.darwin-x86_64.txt b/CMakeLists.darwin-x86_64.txt
index b24de154688..075d57df502 100644
--- a/CMakeLists.darwin-x86_64.txt
+++ b/CMakeLists.darwin-x86_64.txt
@@ -13,4 +13,3 @@ add_subdirectory(util)
 add_subdirectory(yt)
 add_subdirectory(certs)
 add_subdirectory(ydb)
-add_subdirectory(yql)
diff --git a/CMakeLists.linux-aarch64.txt b/CMakeLists.linux-aarch64.txt
index b24de154688..075d57df502 100644
--- a/CMakeLists.linux-aarch64.txt
+++ b/CMakeLists.linux-aarch64.txt
@@ -13,4 +13,3 @@ add_subdirectory(util)
 add_subdirectory(yt)
 add_subdirectory(certs)
 add_subdirectory(ydb)
-add_subdirectory(yql)
diff --git a/CMakeLists.linux-x86_64.txt b/CMakeLists.linux-x86_64.txt
index b24de154688..075d57df502 100644
--- a/CMakeLists.linux-x86_64.txt
+++ b/CMakeLists.linux-x86_64.txt
@@ -13,4 +13,3 @@ add_subdirectory(util)
 add_subdirectory(yt)
 add_subdirectory(certs)
 add_subdirectory(ydb)
-add_subdirectory(yql)
diff --git a/CMakeLists.windows-x86_64.txt b/CMakeLists.windows-x86_64.txt
index 0348a298de3..e8667d4e27c 100644
--- a/CMakeLists.windows-x86_64.txt
+++ b/CMakeLists.windows-x86_64.txt
@@ -13,4 +13,3 @@ add_subdirectory(library)
 add_subdirectory(yt)
 add_subdirectory(certs)
 add_subdirectory(ydb)
-add_subdirectory(yql)
diff --git a/ydb/library/yql/CMakeLists.txt b/ydb/library/yql/CMakeLists.txt
index 32d85b66b25..7f41afad8ef 100644
--- a/ydb/library/yql/CMakeLists.txt
+++ b/ydb/library/yql/CMakeLists.txt
@@ -11,7 +11,6 @@ add_subdirectory(core)
 add_subdirectory(dq)
 add_subdirectory(minikql)
 add_subdirectory(parser)
-add_subdirectory(protobuf_udf)
 add_subdirectory(protos)
 add_subdirectory(providers)
 add_subdirectory(public)
diff --git a/ydb/library/yql/minikql/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/minikql/CMakeLists.darwin-x86_64.txt
index 09684df2ae7..d7036faa1e9 100644
--- a/ydb/library/yql/minikql/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/minikql/CMakeLists.darwin-x86_64.txt
@@ -16,6 +16,7 @@ add_subdirectory(dom)
 add_subdirectory(invoke_builtins)
 add_subdirectory(jsonpath)
 add_subdirectory(perf)
+add_subdirectory(protobuf_udf)
 add_subdirectory(ut)
 
 add_library(library-yql-minikql)
diff --git a/ydb/library/yql/minikql/CMakeLists.linux-aarch64.txt b/ydb/library/yql/minikql/CMakeLists.linux-aarch64.txt
index af687a328e9..aefc1d509df 100644
--- a/ydb/library/yql/minikql/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/minikql/CMakeLists.linux-aarch64.txt
@@ -16,6 +16,7 @@ add_subdirectory(dom)
 add_subdirectory(invoke_builtins)
 add_subdirectory(jsonpath)
 add_subdirectory(perf)
+add_subdirectory(protobuf_udf)
 add_subdirectory(ut)
 
 add_library(library-yql-minikql)
diff --git a/ydb/library/yql/minikql/CMakeLists.linux-x86_64.txt b/ydb/library/yql/minikql/CMakeLists.linux-x86_64.txt
index af687a328e9..aefc1d509df 100644
--- a/ydb/library/yql/minikql/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/minikql/CMakeLists.linux-x86_64.txt
@@ -16,6 +16,7 @@ add_subdirectory(dom)
 add_subdirectory(invoke_builtins)
 add_subdirectory(jsonpath)
 add_subdirectory(perf)
+add_subdirectory(protobuf_udf)
 add_subdirectory(ut)
 
 add_library(library-yql-minikql)
diff --git a/ydb/library/yql/minikql/CMakeLists.windows-x86_64.txt b/ydb/library/yql/minikql/CMakeLists.windows-x86_64.txt
index 09684df2ae7..d7036faa1e9 100644
--- a/ydb/library/yql/minikql/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/minikql/CMakeLists.windows-x86_64.txt
@@ -16,6 +16,7 @@ add_subdirectory(dom)
 add_subdirectory(invoke_builtins)
 add_subdirectory(jsonpath)
 add_subdirectory(perf)
+add_subdirectory(protobuf_udf)
 add_subdirectory(ut)
 
 add_library(library-yql-minikql)
diff --git a/ydb/library/yql/protobuf_udf/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.darwin-x86_64.txt
index 5291f23d84e..a16f0ca400c 100644
--- a/ydb/library/yql/protobuf_udf/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.darwin-x86_64.txt
@@ -8,26 +8,24 @@
 
 add_subdirectory(ut)
 
-add_library(library-yql-protobuf_udf)
-target_compile_options(library-yql-protobuf_udf PRIVATE
+add_library(yql-minikql-protobuf_udf)
+target_compile_options(yql-minikql-protobuf_udf PRIVATE
   -DUDF_ABI_VERSION_MAJOR=2
   -DUDF_ABI_VERSION_MINOR=9
   -DUDF_ABI_VERSION_PATCH=0
 )
-target_link_libraries(library-yql-protobuf_udf PUBLIC
+target_link_libraries(yql-minikql-protobuf_udf PUBLIC
   contrib-libs-cxxsupp
   yutil
   contrib-libs-protobuf
   cpp-protobuf-yql
   yql-public-udf
-  library-yql-minikql
-  library-yql-utils
   cpp-mapreduce-interface
   yt_proto-yt-formats
 )
-target_sources(library-yql-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/value_builder.cpp
+target_sources(yql-minikql-protobuf_udf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/proto_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/module.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/type_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/value_builder.cpp
 )
diff --git a/ydb/library/yql/protobuf_udf/CMakeLists.linux-aarch64.txt b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.linux-aarch64.txt
index 1d5e018520a..19bef14f9a6 100644
--- a/ydb/library/yql/protobuf_udf/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.linux-aarch64.txt
@@ -8,27 +8,25 @@
 
 add_subdirectory(ut)
 
-add_library(library-yql-protobuf_udf)
-target_compile_options(library-yql-protobuf_udf PRIVATE
+add_library(yql-minikql-protobuf_udf)
+target_compile_options(yql-minikql-protobuf_udf PRIVATE
   -DUDF_ABI_VERSION_MAJOR=2
   -DUDF_ABI_VERSION_MINOR=9
   -DUDF_ABI_VERSION_PATCH=0
 )
-target_link_libraries(library-yql-protobuf_udf PUBLIC
+target_link_libraries(yql-minikql-protobuf_udf PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   contrib-libs-protobuf
   cpp-protobuf-yql
   yql-public-udf
-  library-yql-minikql
-  library-yql-utils
   cpp-mapreduce-interface
   yt_proto-yt-formats
 )
-target_sources(library-yql-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/value_builder.cpp
+target_sources(yql-minikql-protobuf_udf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/proto_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/module.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/type_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/value_builder.cpp
 )
diff --git a/ydb/library/yql/protobuf_udf/CMakeLists.linux-x86_64.txt b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.linux-x86_64.txt
index 1d5e018520a..19bef14f9a6 100644
--- a/ydb/library/yql/protobuf_udf/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.linux-x86_64.txt
@@ -8,27 +8,25 @@
 
 add_subdirectory(ut)
 
-add_library(library-yql-protobuf_udf)
-target_compile_options(library-yql-protobuf_udf PRIVATE
+add_library(yql-minikql-protobuf_udf)
+target_compile_options(yql-minikql-protobuf_udf PRIVATE
   -DUDF_ABI_VERSION_MAJOR=2
   -DUDF_ABI_VERSION_MINOR=9
   -DUDF_ABI_VERSION_PATCH=0
 )
-target_link_libraries(library-yql-protobuf_udf PUBLIC
+target_link_libraries(yql-minikql-protobuf_udf PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   contrib-libs-protobuf
   cpp-protobuf-yql
   yql-public-udf
-  library-yql-minikql
-  library-yql-utils
   cpp-mapreduce-interface
   yt_proto-yt-formats
 )
-target_sources(library-yql-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/value_builder.cpp
+target_sources(yql-minikql-protobuf_udf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/proto_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/module.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/type_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/value_builder.cpp
 )
diff --git a/ydb/library/yql/protobuf_udf/CMakeLists.txt b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.txt
index f8b31df0c11..f8b31df0c11 100644
--- a/ydb/library/yql/protobuf_udf/CMakeLists.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.txt
diff --git a/ydb/library/yql/protobuf_udf/CMakeLists.windows-x86_64.txt b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.windows-x86_64.txt
index 5291f23d84e..a16f0ca400c 100644
--- a/ydb/library/yql/protobuf_udf/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/CMakeLists.windows-x86_64.txt
@@ -8,26 +8,24 @@
 
 add_subdirectory(ut)
 
-add_library(library-yql-protobuf_udf)
-target_compile_options(library-yql-protobuf_udf PRIVATE
+add_library(yql-minikql-protobuf_udf)
+target_compile_options(yql-minikql-protobuf_udf PRIVATE
   -DUDF_ABI_VERSION_MAJOR=2
   -DUDF_ABI_VERSION_MINOR=9
   -DUDF_ABI_VERSION_PATCH=0
 )
-target_link_libraries(library-yql-protobuf_udf PUBLIC
+target_link_libraries(yql-minikql-protobuf_udf PUBLIC
   contrib-libs-cxxsupp
   yutil
   contrib-libs-protobuf
   cpp-protobuf-yql
   yql-public-udf
-  library-yql-minikql
-  library-yql-utils
   cpp-mapreduce-interface
   yt_proto-yt-formats
 )
-target_sources(library-yql-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/value_builder.cpp
+target_sources(yql-minikql-protobuf_udf PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/proto_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/module.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/type_builder.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/value_builder.cpp
 )
diff --git a/ydb/library/yql/protobuf_udf/module.cpp b/ydb/library/yql/minikql/protobuf_udf/module.cpp
index 95befe2220e..95befe2220e 100644
--- a/ydb/library/yql/protobuf_udf/module.cpp
+++ b/ydb/library/yql/minikql/protobuf_udf/module.cpp
diff --git a/ydb/library/yql/protobuf_udf/module.h b/ydb/library/yql/minikql/protobuf_udf/module.h
index c6fb373e518..c6fb373e518 100644
--- a/ydb/library/yql/protobuf_udf/module.h
+++ b/ydb/library/yql/minikql/protobuf_udf/module.h
diff --git a/ydb/library/yql/protobuf_udf/proto_builder.cpp b/ydb/library/yql/minikql/protobuf_udf/proto_builder.cpp
index 883101d12c8..59870420244 100644
--- a/ydb/library/yql/protobuf_udf/proto_builder.cpp
+++ b/ydb/library/yql/minikql/protobuf_udf/proto_builder.cpp
@@ -1,7 +1,6 @@
 #include "proto_builder.h"
 
 #include <ydb/library/yql/public/udf/udf_value_builder.h>
-#include <ydb/library/yql/minikql/mkql_string_util.h>
 
 #include <util/generic/singleton.h>
 
diff --git a/ydb/library/yql/protobuf_udf/proto_builder.h b/ydb/library/yql/minikql/protobuf_udf/proto_builder.h
index dab934ad98a..bceb7ecd301 100644
--- a/ydb/library/yql/protobuf_udf/proto_builder.h
+++ b/ydb/library/yql/minikql/protobuf_udf/proto_builder.h
@@ -2,7 +2,7 @@
 
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
-#include <ydb/library/yql/protobuf_udf/type_builder.h>
+#include <ydb/library/yql/minikql/protobuf_udf/type_builder.h>
 #include <ydb/library/yql/public/udf/udf_type_builder.h>
 
 #include <util/generic/vector.h>
diff --git a/ydb/library/yql/protobuf_udf/type_builder.cpp b/ydb/library/yql/minikql/protobuf_udf/type_builder.cpp
index 9817cd55a32..9817cd55a32 100644
--- a/ydb/library/yql/protobuf_udf/type_builder.cpp
+++ b/ydb/library/yql/minikql/protobuf_udf/type_builder.cpp
diff --git a/ydb/library/yql/protobuf_udf/type_builder.h b/ydb/library/yql/minikql/protobuf_udf/type_builder.h
index d2e5543e5f3..d2e5543e5f3 100644
--- a/ydb/library/yql/protobuf_udf/type_builder.h
+++ b/ydb/library/yql/minikql/protobuf_udf/type_builder.h
diff --git a/ydb/library/yql/protobuf_udf/ut/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.darwin-x86_64.txt
index 7a6463cd05d..0ee35f2aad5 100644
--- a/ydb/library/yql/protobuf_udf/ut/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.darwin-x86_64.txt
@@ -19,19 +19,19 @@ get_built_tool_path(
   cpp_styleguide
 )
 
-add_executable(ydb-library-yql-protobuf_udf-ut)
-target_compile_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+add_executable(ydb-library-yql-minikql-protobuf_udf-ut)
+target_compile_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf
+target_include_directories(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf
 )
-target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
+target_link_libraries(ydb-library-yql-minikql-protobuf_udf-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  library-yql-protobuf_udf
+  yql-minikql-protobuf_udf
   yt-lib-schema
   providers-yt-common
   yql-parser-pg_wrapper
@@ -41,31 +41,31 @@ target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
   common-schema-mkql
   contrib-libs-protobuf
 )
-target_link_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+target_link_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
   -fPIC
   -fPIC
   -framework
   CoreFoundation
 )
-target_proto_messages(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/protobuf_ut.proto
+target_proto_messages(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.proto
 )
-target_sources(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/type_builder_ut.cpp
+target_sources(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/type_builder_ut.cpp
 )
 set_property(
   TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -75,22 +75,22 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-library-yql-protobuf_udf-ut
+target_allocator(ydb-library-yql-minikql-protobuf_udf-ut
   system_allocator
 )
-target_proto_addincls(ydb-library-yql-protobuf_udf-ut
+target_proto_addincls(ydb-library-yql-minikql-protobuf_udf-ut
   ./
   ${CMAKE_SOURCE_DIR}/
   ${CMAKE_BINARY_DIR}
@@ -99,8 +99,8 @@ target_proto_addincls(ydb-library-yql-protobuf_udf-ut
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
-target_proto_outs(ydb-library-yql-protobuf_udf-ut
+target_proto_outs(ydb-library-yql-minikql-protobuf_udf-ut
   --cpp_out=${CMAKE_BINARY_DIR}/
   --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
 )
-vcs_info(ydb-library-yql-protobuf_udf-ut)
+vcs_info(ydb-library-yql-minikql-protobuf_udf-ut)
diff --git a/ydb/library/yql/protobuf_udf/ut/CMakeLists.linux-aarch64.txt b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.linux-aarch64.txt
index b6b44236a9d..aa54aec6a18 100644
--- a/ydb/library/yql/protobuf_udf/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.linux-aarch64.txt
@@ -19,19 +19,19 @@ get_built_tool_path(
   cpp_styleguide
 )
 
-add_executable(ydb-library-yql-protobuf_udf-ut)
-target_compile_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+add_executable(ydb-library-yql-minikql-protobuf_udf-ut)
+target_compile_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf
+target_include_directories(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf
 )
-target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
+target_link_libraries(ydb-library-yql-minikql-protobuf_udf-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   cpp-testing-unittest_main
-  library-yql-protobuf_udf
+  yql-minikql-protobuf_udf
   yt-lib-schema
   providers-yt-common
   yql-parser-pg_wrapper
@@ -41,7 +41,7 @@ target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
   common-schema-mkql
   contrib-libs-protobuf
 )
-target_link_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+target_link_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -51,24 +51,24 @@ target_link_options(ydb-library-yql-protobuf_udf-ut PRIVATE
   -lrt
   -ldl
 )
-target_proto_messages(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/protobuf_ut.proto
+target_proto_messages(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.proto
 )
-target_sources(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/type_builder_ut.cpp
+target_sources(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/type_builder_ut.cpp
 )
 set_property(
   TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -78,22 +78,22 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-library-yql-protobuf_udf-ut
+target_allocator(ydb-library-yql-minikql-protobuf_udf-ut
   cpp-malloc-jemalloc
 )
-target_proto_addincls(ydb-library-yql-protobuf_udf-ut
+target_proto_addincls(ydb-library-yql-minikql-protobuf_udf-ut
   ./
   ${CMAKE_SOURCE_DIR}/
   ${CMAKE_BINARY_DIR}
@@ -102,8 +102,8 @@ target_proto_addincls(ydb-library-yql-protobuf_udf-ut
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
-target_proto_outs(ydb-library-yql-protobuf_udf-ut
+target_proto_outs(ydb-library-yql-minikql-protobuf_udf-ut
   --cpp_out=${CMAKE_BINARY_DIR}/
   --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
 )
-vcs_info(ydb-library-yql-protobuf_udf-ut)
+vcs_info(ydb-library-yql-minikql-protobuf_udf-ut)
diff --git a/ydb/library/yql/protobuf_udf/ut/CMakeLists.linux-x86_64.txt b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.linux-x86_64.txt
index 456b5e3d4d8..81dc00151bb 100644
--- a/ydb/library/yql/protobuf_udf/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.linux-x86_64.txt
@@ -19,20 +19,20 @@ get_built_tool_path(
   cpp_styleguide
 )
 
-add_executable(ydb-library-yql-protobuf_udf-ut)
-target_compile_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+add_executable(ydb-library-yql-minikql-protobuf_udf-ut)
+target_compile_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf
+target_include_directories(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf
 )
-target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
+target_link_libraries(ydb-library-yql-minikql-protobuf_udf-ut PUBLIC
   contrib-libs-linux-headers
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  library-yql-protobuf_udf
+  yql-minikql-protobuf_udf
   yt-lib-schema
   providers-yt-common
   yql-parser-pg_wrapper
@@ -42,7 +42,7 @@ target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
   common-schema-mkql
   contrib-libs-protobuf
 )
-target_link_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+target_link_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -52,24 +52,24 @@ target_link_options(ydb-library-yql-protobuf_udf-ut PRIVATE
   -lrt
   -ldl
 )
-target_proto_messages(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/protobuf_ut.proto
+target_proto_messages(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.proto
 )
-target_sources(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/type_builder_ut.cpp
+target_sources(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/type_builder_ut.cpp
 )
 set_property(
   TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -79,23 +79,23 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-library-yql-protobuf_udf-ut
+target_allocator(ydb-library-yql-minikql-protobuf_udf-ut
   cpp-malloc-tcmalloc
   libs-tcmalloc-no_percpu_cache
 )
-target_proto_addincls(ydb-library-yql-protobuf_udf-ut
+target_proto_addincls(ydb-library-yql-minikql-protobuf_udf-ut
   ./
   ${CMAKE_SOURCE_DIR}/
   ${CMAKE_BINARY_DIR}
@@ -104,8 +104,8 @@ target_proto_addincls(ydb-library-yql-protobuf_udf-ut
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
-target_proto_outs(ydb-library-yql-protobuf_udf-ut
+target_proto_outs(ydb-library-yql-minikql-protobuf_udf-ut
   --cpp_out=${CMAKE_BINARY_DIR}/
   --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
 )
-vcs_info(ydb-library-yql-protobuf_udf-ut)
+vcs_info(ydb-library-yql-minikql-protobuf_udf-ut)
diff --git a/ydb/library/yql/protobuf_udf/ut/CMakeLists.txt b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.txt
index f8b31df0c11..f8b31df0c11 100644
--- a/ydb/library/yql/protobuf_udf/ut/CMakeLists.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.txt
diff --git a/ydb/library/yql/protobuf_udf/ut/CMakeLists.windows-x86_64.txt b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.windows-x86_64.txt
index e86e7bd371c..829f4837e63 100644
--- a/ydb/library/yql/protobuf_udf/ut/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/CMakeLists.windows-x86_64.txt
@@ -19,19 +19,19 @@ get_built_tool_path(
   cpp_styleguide
 )
 
-add_executable(ydb-library-yql-protobuf_udf-ut)
-target_compile_options(ydb-library-yql-protobuf_udf-ut PRIVATE
+add_executable(ydb-library-yql-minikql-protobuf_udf-ut)
+target_compile_options(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
   -DUSE_CURRENT_UDF_ABI_VERSION
 )
-target_include_directories(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf
+target_include_directories(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf
 )
-target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
+target_link_libraries(ydb-library-yql-minikql-protobuf_udf-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  library-yql-protobuf_udf
+  yql-minikql-protobuf_udf
   yt-lib-schema
   providers-yt-common
   yql-parser-pg_wrapper
@@ -41,24 +41,24 @@ target_link_libraries(ydb-library-yql-protobuf_udf-ut PUBLIC
   common-schema-mkql
   contrib-libs-protobuf
 )
-target_proto_messages(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/protobuf_ut.proto
+target_proto_messages(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.proto
 )
-target_sources(ydb-library-yql-protobuf_udf-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/library/yql/protobuf_udf/ut/type_builder_ut.cpp
+target_sources(ydb-library-yql-minikql-protobuf_udf-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/library/yql/minikql/protobuf_udf/ut/type_builder_ut.cpp
 )
 set_property(
   TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   SPLIT_FACTOR
   1
 )
 add_yunittest(
   NAME
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_TARGET
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   TEST_ARG
   --print-before-suite
   --print-before-test
@@ -68,22 +68,22 @@ add_yunittest(
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   LABELS
   SMALL
 )
 set_yunittest_property(
   TEST
-  ydb-library-yql-protobuf_udf-ut
+  ydb-library-yql-minikql-protobuf_udf-ut
   PROPERTY
   PROCESSORS
   1
 )
-target_allocator(ydb-library-yql-protobuf_udf-ut
+target_allocator(ydb-library-yql-minikql-protobuf_udf-ut
   system_allocator
 )
-target_proto_addincls(ydb-library-yql-protobuf_udf-ut
+target_proto_addincls(ydb-library-yql-minikql-protobuf_udf-ut
   ./
   ${CMAKE_SOURCE_DIR}/
   ${CMAKE_BINARY_DIR}
@@ -92,8 +92,8 @@ target_proto_addincls(ydb-library-yql-protobuf_udf-ut
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src
 )
-target_proto_outs(ydb-library-yql-protobuf_udf-ut
+target_proto_outs(ydb-library-yql-minikql-protobuf_udf-ut
   --cpp_out=${CMAKE_BINARY_DIR}/
   --cpp_styleguide_out=${CMAKE_BINARY_DIR}/
 )
-vcs_info(ydb-library-yql-protobuf_udf-ut)
+vcs_info(ydb-library-yql-minikql-protobuf_udf-ut)
diff --git a/ydb/library/yql/protobuf_udf/ut/protobuf_ut.proto b/ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.proto
index ed1c2834202..ed1c2834202 100644
--- a/ydb/library/yql/protobuf_udf/ut/protobuf_ut.proto
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.proto
diff --git a/ydb/library/yql/protobuf_udf/ut/type_builder_ut.cpp b/ydb/library/yql/minikql/protobuf_udf/ut/type_builder_ut.cpp
index cf884262059..323e5a73569 100644
--- a/ydb/library/yql/protobuf_udf/ut/type_builder_ut.cpp
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/type_builder_ut.cpp
@@ -1,7 +1,7 @@
 #include "type_builder.h"
 
 //#include <alice/wonderlogs/protos/wonderlogs.pb.h>
-#include <ydb/library/yql/protobuf_udf/ut/protobuf_ut.pb.h>
+#include <ydb/library/yql/minikql/protobuf_udf/ut/protobuf_ut.pb.h>
 #include <ydb/library/yql/providers/yt/lib/schema/schema.h>
 #include <ydb/library/yql/providers/yt/common/yql_names.h>
 
diff --git a/ydb/library/yql/protobuf_udf/ut/ya.make b/ydb/library/yql/minikql/protobuf_udf/ut/ya.make
index b61ae76a6dd..b670a5560b7 100644
--- a/ydb/library/yql/protobuf_udf/ut/ya.make
+++ b/ydb/library/yql/minikql/protobuf_udf/ut/ya.make
@@ -1,4 +1,4 @@
-UNITTEST_FOR(ydb/library/yql/protobuf_udf)
+UNITTEST_FOR(ydb/library/yql/minikql/protobuf_udf)
 
 SRCS(
     type_builder_ut.cpp
diff --git a/ydb/library/yql/protobuf_udf/value_builder.cpp b/ydb/library/yql/minikql/protobuf_udf/value_builder.cpp
index 0d7575332ae..0d7575332ae 100644
--- a/ydb/library/yql/protobuf_udf/value_builder.cpp
+++ b/ydb/library/yql/minikql/protobuf_udf/value_builder.cpp
diff --git a/ydb/library/yql/protobuf_udf/value_builder.h b/ydb/library/yql/minikql/protobuf_udf/value_builder.h
index 5362638d23d..5362638d23d 100644
--- a/ydb/library/yql/protobuf_udf/value_builder.h
+++ b/ydb/library/yql/minikql/protobuf_udf/value_builder.h
diff --git a/ydb/library/yql/protobuf_udf/ya.make b/ydb/library/yql/minikql/protobuf_udf/ya.make
index 578a42a2e8e..69641fa9402 100644
--- a/ydb/library/yql/protobuf_udf/ya.make
+++ b/ydb/library/yql/minikql/protobuf_udf/ya.make
@@ -13,8 +13,6 @@ PEERDIR(
     contrib/libs/protobuf
     library/cpp/protobuf/yql
     ydb/library/yql/public/udf
-    ydb/library/yql/minikql
-    ydb/library/yql/utils
     yt/cpp/mapreduce/interface
     yt/yt_proto/yt/formats
     yt/yt_proto/yt/formats
diff --git a/ydb/library/yql/minikql/ya.make b/ydb/library/yql/minikql/ya.make
index eb336034ce1..26c371a3382 100644
--- a/ydb/library/yql/minikql/ya.make
+++ b/ydb/library/yql/minikql/ya.make
@@ -95,6 +95,7 @@ RECURSE(
     invoke_builtins
     jsonpath
     perf
+    protobuf_udf
 )
 
 RECURSE_FOR_TESTS(
diff --git a/ydb/library/yql/udfs/common/protobuf/CMakeLists.darwin-x86_64.txt b/ydb/library/yql/udfs/common/protobuf/CMakeLists.darwin-x86_64.txt
index 1dec5ce33c3..eac32969d7f 100644
--- a/ydb/library/yql/udfs/common/protobuf/CMakeLists.darwin-x86_64.txt
+++ b/ydb/library/yql/udfs/common/protobuf/CMakeLists.darwin-x86_64.txt
@@ -23,7 +23,7 @@ target_link_libraries(protobuf_udf.dyn PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_link_options(protobuf_udf.dyn PRIVATE
   -Wl,-platform_version,macos,11.0,11.0
@@ -31,8 +31,6 @@ target_link_options(protobuf_udf.dyn PRIVATE
   -undefined
   dynamic_lookup
   -fPIC
-  -framework
-  CoreFoundation
 )
 target_sources(protobuf_udf.dyn PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/protobuf/protobuf_udf.cpp
@@ -49,7 +47,7 @@ target_link_libraries(protobuf_udf INTERFACE
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 
 add_global_library_for(protobuf_udf.global protobuf_udf)
@@ -64,7 +62,7 @@ target_link_libraries(protobuf_udf.global PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_sources(protobuf_udf.global PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/protobuf/protobuf_udf.cpp
diff --git a/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-aarch64.txt b/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-aarch64.txt
index 57d2994a98b..1fab62cf306 100644
--- a/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-aarch64.txt
+++ b/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-aarch64.txt
@@ -24,7 +24,7 @@ target_link_libraries(protobuf_udf.dyn PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_link_options(protobuf_udf.dyn PRIVATE
   -ldl
@@ -54,7 +54,7 @@ target_link_libraries(protobuf_udf INTERFACE
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 
 add_global_library_for(protobuf_udf.global protobuf_udf)
@@ -70,7 +70,7 @@ target_link_libraries(protobuf_udf.global PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_sources(protobuf_udf.global PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/protobuf/protobuf_udf.cpp
diff --git a/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-x86_64.txt b/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-x86_64.txt
index 57d2994a98b..1fab62cf306 100644
--- a/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-x86_64.txt
+++ b/ydb/library/yql/udfs/common/protobuf/CMakeLists.linux-x86_64.txt
@@ -24,7 +24,7 @@ target_link_libraries(protobuf_udf.dyn PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_link_options(protobuf_udf.dyn PRIVATE
   -ldl
@@ -54,7 +54,7 @@ target_link_libraries(protobuf_udf INTERFACE
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 
 add_global_library_for(protobuf_udf.global protobuf_udf)
@@ -70,7 +70,7 @@ target_link_libraries(protobuf_udf.global PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_sources(protobuf_udf.global PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/protobuf/protobuf_udf.cpp
diff --git a/ydb/library/yql/udfs/common/protobuf/CMakeLists.windows-x86_64.txt b/ydb/library/yql/udfs/common/protobuf/CMakeLists.windows-x86_64.txt
index 0287e506d45..2a9af95297d 100644
--- a/ydb/library/yql/udfs/common/protobuf/CMakeLists.windows-x86_64.txt
+++ b/ydb/library/yql/udfs/common/protobuf/CMakeLists.windows-x86_64.txt
@@ -23,7 +23,7 @@ target_link_libraries(protobuf_udf.dyn PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_sources(protobuf_udf.dyn PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/protobuf/protobuf_udf.cpp
@@ -40,7 +40,7 @@ target_link_libraries(protobuf_udf INTERFACE
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 
 add_global_library_for(protobuf_udf.global protobuf_udf)
@@ -55,7 +55,7 @@ target_link_libraries(protobuf_udf.global PUBLIC
   yql-public-udf
   public-udf-support
   cpp-protobuf-yql
-  yql-library-protobuf_udf
+  yql-minikql-protobuf_udf
 )
 target_sources(protobuf_udf.global PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/library/yql/udfs/common/protobuf/protobuf_udf.cpp
diff --git a/ydb/library/yql/udfs/common/protobuf/test/canondata/test.test_recursion_fail_/extracted b/ydb/library/yql/udfs/common/protobuf/test/canondata/test.test_recursion_fail_/extracted
index 0b4b0d3a379..03c2d45e8e7 100644
--- a/ydb/library/yql/udfs/common/protobuf/test/canondata/test.test_recursion_fail_/extracted
+++ b/ydb/library/yql/udfs/common/protobuf/test/canondata/test.test_recursion_fail_/extracted
@@ -6,6 +6,6 @@
         <tmp_path>/program.sql:<main>:64:8: Error: At function: NamedApply, At function: Udf, At Protobuf.Parse
         	SELECT $udf(TestField) FROM plato.Input;
 	       ^
-            <tmp_path>/program.sql:<main>:64:8: Error: Failed to find UDF function: Protobuf.Parse, reason: Error: Module: Protobuf, function: Parse, error: (yexception) yql/library/protobuf_udf/type_builder.cpp:xxx: can't handle recursive types: Test
+            <tmp_path>/program.sql:<main>:64:8: Error: Failed to find UDF function: Protobuf.Parse, reason: Error: Module: Protobuf, function: Parse, error: (yexception) ydb/library/yql/minikql/protobuf_udf/type_builder.cpp:xxx: can't handle recursive types: Test
             	SELECT $udf(TestField) FROM plato.Input;
 	       ^
\ No newline at end of file
diff --git a/ydb/library/yql/udfs/common/protobuf/ya.make b/ydb/library/yql/udfs/common/protobuf/ya.make
index 83e45fd574d..183c747a51b 100644
--- a/ydb/library/yql/udfs/common/protobuf/ya.make
+++ b/ydb/library/yql/udfs/common/protobuf/ya.make
@@ -12,7 +12,8 @@ SRCS(
 
 PEERDIR(
     library/cpp/protobuf/yql
-    yql/library/protobuf_udf
+    ydb/library/yql/minikql/protobuf_udf
+    ydb/library/yql/public/udf
 )
 
 END()
diff --git a/ydb/library/yql/ya.make b/ydb/library/yql/ya.make
index 89825313e15..3aafe2834a0 100644
--- a/ydb/library/yql/ya.make
+++ b/ydb/library/yql/ya.make
@@ -4,7 +4,6 @@ RECURSE(
     dq
     minikql
     parser
-    protobuf_udf
     protos
     providers
     public
diff --git a/yql/CMakeLists.txt b/yql/CMakeLists.txt
deleted file mode 100644
index 3642e95e645..00000000000
--- a/yql/CMakeLists.txt
+++ /dev/null
@@ -1,9 +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(library)
diff --git a/yql/library/CMakeLists.txt b/yql/library/CMakeLists.txt
deleted file mode 100644
index f02e617aae3..00000000000
--- a/yql/library/CMakeLists.txt
+++ /dev/null
@@ -1,9 +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(protobuf_udf)
diff --git a/yql/library/protobuf_udf/CMakeLists.darwin-x86_64.txt b/yql/library/protobuf_udf/CMakeLists.darwin-x86_64.txt
deleted file mode 100644
index 68152b43f2b..00000000000
--- a/yql/library/protobuf_udf/CMakeLists.darwin-x86_64.txt
+++ /dev/null
@@ -1,32 +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_library(yql-library-protobuf_udf)
-target_compile_options(yql-library-protobuf_udf PRIVATE
-  -DUDF_ABI_VERSION_MAJOR=2
-  -DUDF_ABI_VERSION_MINOR=9
-  -DUDF_ABI_VERSION_PATCH=0
-)
-target_link_libraries(yql-library-protobuf_udf PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-  cpp-protobuf-yql
-  yql-public-udf
-  library-yql-minikql
-  library-yql-utils
-  cpp-mapreduce-interface
-  yt_proto-yt-formats
-)
-target_sources(yql-library-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/value_builder.cpp
-)
diff --git a/yql/library/protobuf_udf/CMakeLists.linux-aarch64.txt b/yql/library/protobuf_udf/CMakeLists.linux-aarch64.txt
deleted file mode 100644
index 5e5cf9da154..00000000000
--- a/yql/library/protobuf_udf/CMakeLists.linux-aarch64.txt
+++ /dev/null
@@ -1,33 +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_library(yql-library-protobuf_udf)
-target_compile_options(yql-library-protobuf_udf PRIVATE
-  -DUDF_ABI_VERSION_MAJOR=2
-  -DUDF_ABI_VERSION_MINOR=9
-  -DUDF_ABI_VERSION_PATCH=0
-)
-target_link_libraries(yql-library-protobuf_udf PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-  cpp-protobuf-yql
-  yql-public-udf
-  library-yql-minikql
-  library-yql-utils
-  cpp-mapreduce-interface
-  yt_proto-yt-formats
-)
-target_sources(yql-library-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/value_builder.cpp
-)
diff --git a/yql/library/protobuf_udf/CMakeLists.linux-x86_64.txt b/yql/library/protobuf_udf/CMakeLists.linux-x86_64.txt
deleted file mode 100644
index 5e5cf9da154..00000000000
--- a/yql/library/protobuf_udf/CMakeLists.linux-x86_64.txt
+++ /dev/null
@@ -1,33 +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_library(yql-library-protobuf_udf)
-target_compile_options(yql-library-protobuf_udf PRIVATE
-  -DUDF_ABI_VERSION_MAJOR=2
-  -DUDF_ABI_VERSION_MINOR=9
-  -DUDF_ABI_VERSION_PATCH=0
-)
-target_link_libraries(yql-library-protobuf_udf PUBLIC
-  contrib-libs-linux-headers
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-  cpp-protobuf-yql
-  yql-public-udf
-  library-yql-minikql
-  library-yql-utils
-  cpp-mapreduce-interface
-  yt_proto-yt-formats
-)
-target_sources(yql-library-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/value_builder.cpp
-)
diff --git a/yql/library/protobuf_udf/CMakeLists.txt b/yql/library/protobuf_udf/CMakeLists.txt
deleted file mode 100644
index f8b31df0c11..00000000000
--- a/yql/library/protobuf_udf/CMakeLists.txt
+++ /dev/null
@@ -1,17 +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.
-
-
-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()
diff --git a/yql/library/protobuf_udf/CMakeLists.windows-x86_64.txt b/yql/library/protobuf_udf/CMakeLists.windows-x86_64.txt
deleted file mode 100644
index 68152b43f2b..00000000000
--- a/yql/library/protobuf_udf/CMakeLists.windows-x86_64.txt
+++ /dev/null
@@ -1,32 +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_library(yql-library-protobuf_udf)
-target_compile_options(yql-library-protobuf_udf PRIVATE
-  -DUDF_ABI_VERSION_MAJOR=2
-  -DUDF_ABI_VERSION_MINOR=9
-  -DUDF_ABI_VERSION_PATCH=0
-)
-target_link_libraries(yql-library-protobuf_udf PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  contrib-libs-protobuf
-  cpp-protobuf-yql
-  yql-public-udf
-  library-yql-minikql
-  library-yql-utils
-  cpp-mapreduce-interface
-  yt_proto-yt-formats
-)
-target_sources(yql-library-protobuf_udf PRIVATE
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/proto_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/module.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/type_builder.cpp
-  ${CMAKE_SOURCE_DIR}/yql/library/protobuf_udf/value_builder.cpp
-)