Bind YQL_UDF in arcadia/ydb to arcadia/ydb

42 files changed, 99 insertions, 41 deletions

diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf
index 6d84df55b9..a134843634 100644
--- a/build/conf/project_specific/yql_udf.conf
+++ b/build/conf/project_specific/yql_udf.conf
@@ -44,6 +44,17 @@ module YQL_UDF_TEST: PY3TEST_BIN {
     DATA(arcadia/ydb/library/yql/cfg/udf_test)
 }
 
+module YQL_UDF_YDB_TEST: PY3TEST_BIN {
+    SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
+
+    PEERDIR(ydb/library/yql/tests/common/udf_test)
+
+    DEPENDS(ydb/library/yql/tools/astdiff)
+    DEPENDS(ydb/library/yql/tools/yqlrun)
+    DATA(arcadia/ydb/library/yql/mount)
+    DATA(arcadia/ydb/library/yql/cfg/udf_test)
+}
+
 module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
     PEERDIR(contrib/ydb/library/yql/tests/common/udf_test)
 
@@ -66,6 +77,12 @@ macro _ADD_YQL_UDF_DEPS() {
     PEERDIR(ydb/library/yql/public/udf)
     PEERDIR(ydb/library/yql/public/udf/support)
 }
+
+macro _ADD_YQL_UDF_YDB_DEPS() {
+    PEERDIR(ydb/library/yql/public/udf)
+    PEERDIR(ydb/library/yql/public/udf/support)
+}
+
 macro _ADD_YQL_UDF_DEPS_CONTRIB() {
     PEERDIR(contrib/ydb/library/yql/public/udf)
     PEERDIR(contrib/ydb/library/yql/public/udf/support)
@@ -89,6 +106,19 @@ macro _MAKE_YQL_UDF() {
     SET(EXPORTS_FILE $YQL_UDF_EXPORT)
 }
 
+macro _MAKE_YQL_UDF_YDB() {
+    _ADD_YQL_UDF_YDB_DEPS()
+    SET_APPEND(USER_CXXFLAGS -DBUILD_UDF)
+    # For Windows using declspecs
+    DEFAULT(YQL_UDF_EXPORT ${ARCADIA_ROOT}/ydb/library/yql/public/udf/udfs_exports.exports)
+
+    when ($WINDOWS == "yes") {
+        YQL_UDF_EXPORT=
+    }
+
+    SET(EXPORTS_FILE $YQL_UDF_EXPORT)
+}
+
 macro _MAKE_YQL_UDF_CONTRIB() {
     _ADD_YQL_UDF_DEPS_CONTRIB()
     SET_APPEND(USER_CXXFLAGS -DBUILD_UDF)
@@ -113,6 +143,12 @@ module YQL_UDF_MODULE: UDF_BASE {
     PROVIDES(YqlServicePolicy)
 }
 
+module YQL_UDF_YDB_MODULE: UDF_BASE {
+    .CMD=YQL_UDF_LINK_CMD
+    _MAKE_YQL_UDF_YDB()
+    PROVIDES(YqlServicePolicy)
+}
+
 module YQL_UDF_MODULE_CONTRIB: UDF_BASE {
     .CMD=YQL_UDF_LINK_CMD
     _MAKE_YQL_UDF_CONTRIB()
@@ -154,6 +190,28 @@ multimodule YQL_UDF {
         }
     }
 }
+
+multimodule YQL_UDF_YDB {
+    module YQL_UDF_SHARED: YQL_UDF_YDB_MODULE {
+        .SEM=UDF_SHARED_SEM
+        CMAKE_TARGET_NAME=${REALPRJNAME}.dyn
+        CMAKE_TARGET_ARTEFACT_RENAME_RULES=&& set_target_property OUTPUT_NAME $REALPRJNAME
+        NO_CLANG_TIDY()
+    }
+    module YQL_UDF_STATIC: _DLL_COMPATIBLE_LIBRARY {
+        .ALIASES=SRCS=GLOBAL_SRCS
+        .SEM=CPP_LIBRARY_SEM
+        .GLOBAL_SEM=CPP_OBJ_LIBRARY_SEM
+        OBJ_SUF=.udfs
+        _ADD_YQL_UDF_YDB_DEPS()
+        # disable credits generation for static library
+        SET(CREDITS_FLAGS)
+        when ($MSVC == "yes" || $CYGWIN == "yes") {
+            MODULE_SUFFIX=.static.lib
+        }
+    }
+}
+
 multimodule YQL_UDF_CONTRIB {
     module YQL_UDF_SHARED: YQL_UDF_MODULE_CONTRIB {
         .SEM=UDF_SHARED_SEM
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/test/ya.make b/ydb/library/yql/udfs/common/clickhouse/client/test/ya.make
index a225d1f1ff..a8a0616993 100644
--- a/ydb/library/yql/udfs/common/clickhouse/client/test/ya.make
+++ b/ydb/library/yql/udfs/common/clickhouse/client/test/ya.make
@@ -1,6 +1,6 @@
 IF (OS_LINUX AND CLANG AND NOT WITH_VALGRIND)
 
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/clickhouse/client)
 
diff --git a/ydb/library/yql/udfs/common/clickhouse/client/ya.make b/ydb/library/yql/udfs/common/clickhouse/client/ya.make
index 1d6b728e46..14b5bfda34 100644
--- a/ydb/library/yql/udfs/common/clickhouse/client/ya.make
+++ b/ydb/library/yql/udfs/common/clickhouse/client/ya.make
@@ -1,5 +1,5 @@
 IF (CLANG AND NOT WITH_VALGRIND)
-    YQL_UDF(clickhouse_client_udf)
+    YQL_UDF_YDB(clickhouse_client_udf)
 
     YQL_LAST_ABI_VERSION()
 
diff --git a/ydb/library/yql/udfs/common/datetime/test/ya.make b/ydb/library/yql/udfs/common/datetime/test/ya.make
index c7b1268b46..55e57b1084 100644
--- a/ydb/library/yql/udfs/common/datetime/test/ya.make
+++ b/ydb/library/yql/udfs/common/datetime/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/datetime)
 
diff --git a/ydb/library/yql/udfs/common/datetime/ya.make b/ydb/library/yql/udfs/common/datetime/ya.make
index 741db27251..16985d7fe1 100644
--- a/ydb/library/yql/udfs/common/datetime/ya.make
+++ b/ydb/library/yql/udfs/common/datetime/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(datetime_udf)
+YQL_UDF_YDB(datetime_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/datetime2/test/ya.make b/ydb/library/yql/udfs/common/datetime2/test/ya.make
index 070b15beb7..f074c486ea 100644
--- a/ydb/library/yql/udfs/common/datetime2/test/ya.make
+++ b/ydb/library/yql/udfs/common/datetime2/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/datetime2)
 
diff --git a/ydb/library/yql/udfs/common/datetime2/ya.make b/ydb/library/yql/udfs/common/datetime2/ya.make
index be6ed9c2c1..05a12b59fc 100644
--- a/ydb/library/yql/udfs/common/datetime2/ya.make
+++ b/ydb/library/yql/udfs/common/datetime2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(datetime2_udf)
+YQL_UDF_YDB(datetime2_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/digest/test/ya.make b/ydb/library/yql/udfs/common/digest/test/ya.make
index adbb143471..62bf331515 100644
--- a/ydb/library/yql/udfs/common/digest/test/ya.make
+++ b/ydb/library/yql/udfs/common/digest/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/digest)
 
diff --git a/ydb/library/yql/udfs/common/digest/ya.make b/ydb/library/yql/udfs/common/digest/ya.make
index ff396a71f8..2545044431 100644
--- a/ydb/library/yql/udfs/common/digest/ya.make
+++ b/ydb/library/yql/udfs/common/digest/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(digest_udf)
+YQL_UDF_YDB(digest_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/histogram/test/ya.make b/ydb/library/yql/udfs/common/histogram/test/ya.make
index cc130454f9..d8170f2a10 100644
--- a/ydb/library/yql/udfs/common/histogram/test/ya.make
+++ b/ydb/library/yql/udfs/common/histogram/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 TIMEOUT(600)
 
diff --git a/ydb/library/yql/udfs/common/histogram/ya.make b/ydb/library/yql/udfs/common/histogram/ya.make
index f7efeed182..72e29acfcc 100644
--- a/ydb/library/yql/udfs/common/histogram/ya.make
+++ b/ydb/library/yql/udfs/common/histogram/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(histogram_udf)
+YQL_UDF_YDB(histogram_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/hyperloglog/test/ya.make b/ydb/library/yql/udfs/common/hyperloglog/test/ya.make
index 0d7d8478e1..beaaf1b34d 100644
--- a/ydb/library/yql/udfs/common/hyperloglog/test/ya.make
+++ b/ydb/library/yql/udfs/common/hyperloglog/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(
     ydb/library/yql/udfs/common/hyperloglog
diff --git a/ydb/library/yql/udfs/common/hyperloglog/ya.make b/ydb/library/yql/udfs/common/hyperloglog/ya.make
index f6f44c0523..31b1b9adeb 100644
--- a/ydb/library/yql/udfs/common/hyperloglog/ya.make
+++ b/ydb/library/yql/udfs/common/hyperloglog/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(hyperloglog_udf)
+YQL_UDF_YDB(hyperloglog_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/hyperscan/test/ya.make b/ydb/library/yql/udfs/common/hyperscan/test/ya.make
index bf38f0843c..0e53f44fc6 100644
--- a/ydb/library/yql/udfs/common/hyperscan/test/ya.make
+++ b/ydb/library/yql/udfs/common/hyperscan/test/ya.make
@@ -1,6 +1,6 @@
 IF (OS_LINUX AND CLANG)
 
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/hyperscan)
 
diff --git a/ydb/library/yql/udfs/common/hyperscan/ya.make b/ydb/library/yql/udfs/common/hyperscan/ya.make
index edeb0504a0..72c29e9f01 100644
--- a/ydb/library/yql/udfs/common/hyperscan/ya.make
+++ b/ydb/library/yql/udfs/common/hyperscan/ya.make
@@ -1,6 +1,6 @@
 IF (OS_LINUX AND CLANG)
 
-    YQL_UDF(hyperscan_udf)
+    YQL_UDF_YDB(hyperscan_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/ydb/library/yql/udfs/common/ip_base/test/ya.make b/ydb/library/yql/udfs/common/ip_base/test/ya.make
index 1a21e6734b..0445c44a39 100644
--- a/ydb/library/yql/udfs/common/ip_base/test/ya.make
+++ b/ydb/library/yql/udfs/common/ip_base/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 TIMEOUT(300)
 
diff --git a/ydb/library/yql/udfs/common/ip_base/ya.make b/ydb/library/yql/udfs/common/ip_base/ya.make
index 1fe3d056ed..e9d9b9610f 100644
--- a/ydb/library/yql/udfs/common/ip_base/ya.make
+++ b/ydb/library/yql/udfs/common/ip_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(ip_udf)
+YQL_UDF_YDB(ip_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/json/test/ya.make b/ydb/library/yql/udfs/common/json/test/ya.make
index 73cf7d2f0b..c20b6f8b7b 100644
--- a/ydb/library/yql/udfs/common/json/test/ya.make
+++ b/ydb/library/yql/udfs/common/json/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/json)
 
diff --git a/ydb/library/yql/udfs/common/json/ya.make b/ydb/library/yql/udfs/common/json/ya.make
index 292a0fc1dd..e85d6d1f5e 100644
--- a/ydb/library/yql/udfs/common/json/ya.make
+++ b/ydb/library/yql/udfs/common/json/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(json_udf)
+YQL_UDF_YDB(json_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/json2/test/ya.make b/ydb/library/yql/udfs/common/json2/test/ya.make
index f60cc670b7..14184d461a 100644
--- a/ydb/library/yql/udfs/common/json2/test/ya.make
+++ b/ydb/library/yql/udfs/common/json2/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/json2)
 
diff --git a/ydb/library/yql/udfs/common/json2/ya.make b/ydb/library/yql/udfs/common/json2/ya.make
index 15ccf5a74d..99bf65d806 100644
--- a/ydb/library/yql/udfs/common/json2/ya.make
+++ b/ydb/library/yql/udfs/common/json2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(json2_udf)
+YQL_UDF_YDB(json2_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/math/ya.make b/ydb/library/yql/udfs/common/math/ya.make
index 14f0f2d3b2..49efad201c 100644
--- a/ydb/library/yql/udfs/common/math/ya.make
+++ b/ydb/library/yql/udfs/common/math/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(math_udf)
+YQL_UDF_YDB(math_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/pire/test/ya.make b/ydb/library/yql/udfs/common/pire/test/ya.make
index 817bb1ac5c..2571d8469f 100644
--- a/ydb/library/yql/udfs/common/pire/test/ya.make
+++ b/ydb/library/yql/udfs/common/pire/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/pire)
 
diff --git a/ydb/library/yql/udfs/common/pire/ya.make b/ydb/library/yql/udfs/common/pire/ya.make
index 05f4576a8f..fe7ebf8d7d 100644
--- a/ydb/library/yql/udfs/common/pire/ya.make
+++ b/ydb/library/yql/udfs/common/pire/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(pire_udf)
+YQL_UDF_YDB(pire_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/re2/test/ya.make b/ydb/library/yql/udfs/common/re2/test/ya.make
index dca0d40179..b440cd206f 100644
--- a/ydb/library/yql/udfs/common/re2/test/ya.make
+++ b/ydb/library/yql/udfs/common/re2/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/re2)
 
diff --git a/ydb/library/yql/udfs/common/re2/ya.make b/ydb/library/yql/udfs/common/re2/ya.make
index e68b9105a6..1a95a03806 100644
--- a/ydb/library/yql/udfs/common/re2/ya.make
+++ b/ydb/library/yql/udfs/common/re2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(re2_udf)
+YQL_UDF_YDB(re2_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/set/test/ya.make b/ydb/library/yql/udfs/common/set/test/ya.make
index 497fb2f653..104472f444 100644
--- a/ydb/library/yql/udfs/common/set/test/ya.make
+++ b/ydb/library/yql/udfs/common/set/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/set)
 
diff --git a/ydb/library/yql/udfs/common/set/ya.make b/ydb/library/yql/udfs/common/set/ya.make
index 05c461cebc..b3762a65a6 100644
--- a/ydb/library/yql/udfs/common/set/ya.make
+++ b/ydb/library/yql/udfs/common/set/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(set_udf)
+YQL_UDF_YDB(set_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/stat/ya.make b/ydb/library/yql/udfs/common/stat/ya.make
index 56983c1980..3881aedd14 100644
--- a/ydb/library/yql/udfs/common/stat/ya.make
+++ b/ydb/library/yql/udfs/common/stat/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(stat_udf)
+YQL_UDF_YDB(stat_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/string/test/ya.make b/ydb/library/yql/udfs/common/string/test/ya.make
index 55db01c46a..b1066b61d2 100644
--- a/ydb/library/yql/udfs/common/string/test/ya.make
+++ b/ydb/library/yql/udfs/common/string/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/string)
 
diff --git a/ydb/library/yql/udfs/common/string/ya.make b/ydb/library/yql/udfs/common/string/ya.make
index 2b7e10d172..1a00a72c6f 100644
--- a/ydb/library/yql/udfs/common/string/ya.make
+++ b/ydb/library/yql/udfs/common/string/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(string_udf)
+YQL_UDF_YDB(string_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/top/test/ya.make b/ydb/library/yql/udfs/common/top/test/ya.make
index 34ee2b0f6a..3d6b9e8102 100644
--- a/ydb/library/yql/udfs/common/top/test/ya.make
+++ b/ydb/library/yql/udfs/common/top/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/top)
 
diff --git a/ydb/library/yql/udfs/common/top/ya.make b/ydb/library/yql/udfs/common/top/ya.make
index da0816d2ae..81b50873a0 100644
--- a/ydb/library/yql/udfs/common/top/ya.make
+++ b/ydb/library/yql/udfs/common/top/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(top_udf)
+YQL_UDF_YDB(top_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/topfreq/test/ya.make b/ydb/library/yql/udfs/common/topfreq/test/ya.make
index e13c790915..0a6951aed6 100644
--- a/ydb/library/yql/udfs/common/topfreq/test/ya.make
+++ b/ydb/library/yql/udfs/common/topfreq/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/topfreq)
 
diff --git a/ydb/library/yql/udfs/common/topfreq/ya.make b/ydb/library/yql/udfs/common/topfreq/ya.make
index 219f4c217a..6519774ece 100644
--- a/ydb/library/yql/udfs/common/topfreq/ya.make
+++ b/ydb/library/yql/udfs/common/topfreq/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(topfreq_udf)
+YQL_UDF_YDB(topfreq_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/unicode_base/test/ya.make b/ydb/library/yql/udfs/common/unicode_base/test/ya.make
index bf0cb0b708..487834299d 100644
--- a/ydb/library/yql/udfs/common/unicode_base/test/ya.make
+++ b/ydb/library/yql/udfs/common/unicode_base/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/unicode_base)
 
diff --git a/ydb/library/yql/udfs/common/unicode_base/ya.make b/ydb/library/yql/udfs/common/unicode_base/ya.make
index 8d6834136b..13780ce4e5 100644
--- a/ydb/library/yql/udfs/common/unicode_base/ya.make
+++ b/ydb/library/yql/udfs/common/unicode_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(unicode_udf)
+YQL_UDF_YDB(unicode_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/url_base/test/ya.make b/ydb/library/yql/udfs/common/url_base/test/ya.make
index 225accf577..a8d87b0c16 100644
--- a/ydb/library/yql/udfs/common/url_base/test/ya.make
+++ b/ydb/library/yql/udfs/common/url_base/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/url_base)
 
diff --git a/ydb/library/yql/udfs/common/url_base/ya.make b/ydb/library/yql/udfs/common/url_base/ya.make
index 0dded35dfc..52a23424a4 100644
--- a/ydb/library/yql/udfs/common/url_base/ya.make
+++ b/ydb/library/yql/udfs/common/url_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(url_udf)
+YQL_UDF_YDB(url_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/common/yson2/test/ya.make b/ydb/library/yql/udfs/common/yson2/test/ya.make
index f79b79e571..7229407250 100644
--- a/ydb/library/yql/udfs/common/yson2/test/ya.make
+++ b/ydb/library/yql/udfs/common/yson2/test/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF_TEST()
+YQL_UDF_YDB_TEST()
 
 DEPENDS(ydb/library/yql/udfs/common/yson2)
 
diff --git a/ydb/library/yql/udfs/common/yson2/ya.make b/ydb/library/yql/udfs/common/yson2/ya.make
index 0a0c84b396..1700ce9ff7 100644
--- a/ydb/library/yql/udfs/common/yson2/ya.make
+++ b/ydb/library/yql/udfs/common/yson2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(yson2_udf)
+YQL_UDF_YDB(yson2_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/ydb/library/yql/udfs/logs/dsv/ya.make b/ydb/library/yql/udfs/logs/dsv/ya.make
index 15bdf62fc1..512323942c 100644
--- a/ydb/library/yql/udfs/logs/dsv/ya.make
+++ b/ydb/library/yql/udfs/logs/dsv/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(dsv_udf)
+YQL_UDF_YDB(dsv_udf)
 
 YQL_ABI_VERSION(
     2