Intermediate changes

commit_hash:b5826cf53cbe98e17103fcd8139fdfd091f5e037

36 files changed, 38 insertions, 38 deletions

diff --git a/yql/essentials/udfs/common/compress_base/ya.make b/yql/essentials/udfs/common/compress_base/ya.make
index afb53c7026..4859a4e53c 100644
--- a/yql/essentials/udfs/common/compress_base/ya.make
+++ b/yql/essentials/udfs/common/compress_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(compress_udf)
+YQL_UDF_CONTRIB(compress_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/yql/essentials/udfs/common/datetime2/ya.make b/yql/essentials/udfs/common/datetime2/ya.make
index 4f76f8ccdd..adf6b75419 100644
--- a/yql/essentials/udfs/common/datetime2/ya.make
+++ b/yql/essentials/udfs/common/datetime2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(datetime2_udf)
+YQL_UDF_CONTRIB(datetime2_udf)
     YQL_ABI_VERSION(
         2
         40
diff --git a/yql/essentials/udfs/common/digest/ya.make b/yql/essentials/udfs/common/digest/ya.make
index 9b749787f1..aa9c164770 100644
--- a/yql/essentials/udfs/common/digest/ya.make
+++ b/yql/essentials/udfs/common/digest/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(digest_udf)
+YQL_UDF_CONTRIB(digest_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/file/ya.make b/yql/essentials/udfs/common/file/ya.make
index 7b688ac9c7..250f0722d8 100644
--- a/yql/essentials/udfs/common/file/ya.make
+++ b/yql/essentials/udfs/common/file/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(file_udf)
+YQL_UDF_CONTRIB(file_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/yql/essentials/udfs/common/histogram/ya.make b/yql/essentials/udfs/common/histogram/ya.make
index 1b68553098..51b4a24100 100644
--- a/yql/essentials/udfs/common/histogram/ya.make
+++ b/yql/essentials/udfs/common/histogram/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(histogram_udf)
+YQL_UDF_CONTRIB(histogram_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/hyperloglog/ya.make b/yql/essentials/udfs/common/hyperloglog/ya.make
index 1b2c435c51..2becaf7388 100644
--- a/yql/essentials/udfs/common/hyperloglog/ya.make
+++ b/yql/essentials/udfs/common/hyperloglog/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(hyperloglog_udf)
+YQL_UDF_CONTRIB(hyperloglog_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/hyperscan/ya.make b/yql/essentials/udfs/common/hyperscan/ya.make
index 4f978577be..9217280ba7 100644
--- a/yql/essentials/udfs/common/hyperscan/ya.make
+++ b/yql/essentials/udfs/common/hyperscan/ya.make
@@ -6,7 +6,7 @@
 
     NO_BUILD_IF(DISABLE_HYPERSCAN_BUILD)
 
-YQL_UDF(hyperscan_udf)
+YQL_UDF_CONTRIB(hyperscan_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/ip_base/ya.make b/yql/essentials/udfs/common/ip_base/ya.make
index c8ade057bc..0e5537607a 100644
--- a/yql/essentials/udfs/common/ip_base/ya.make
+++ b/yql/essentials/udfs/common/ip_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(ip_udf)
+YQL_UDF_CONTRIB(ip_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/json/ya.make b/yql/essentials/udfs/common/json/ya.make
index a3e93aaea5..2b2df2dd9a 100644
--- a/yql/essentials/udfs/common/json/ya.make
+++ b/yql/essentials/udfs/common/json/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(json_udf)
+YQL_UDF_CONTRIB(json_udf)
 
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/json2/ya.make b/yql/essentials/udfs/common/json2/ya.make
index dd53278af5..5228912594 100644
--- a/yql/essentials/udfs/common/json2/ya.make
+++ b/yql/essentials/udfs/common/json2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(json2_udf)
+YQL_UDF_CONTRIB(json2_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/math/ya.make b/yql/essentials/udfs/common/math/ya.make
index 0c3868e1ad..4c0909d239 100644
--- a/yql/essentials/udfs/common/math/ya.make
+++ b/yql/essentials/udfs/common/math/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(math_udf)
+YQL_UDF_CONTRIB(math_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/pire/ya.make b/yql/essentials/udfs/common/pire/ya.make
index c0dbe9d891..414b973aa6 100644
--- a/yql/essentials/udfs/common/pire/ya.make
+++ b/yql/essentials/udfs/common/pire/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(pire_udf)
+YQL_UDF_CONTRIB(pire_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/protobuf/ya.make b/yql/essentials/udfs/common/protobuf/ya.make
index 60b86d77d5..714ad77137 100644
--- a/yql/essentials/udfs/common/protobuf/ya.make
+++ b/yql/essentials/udfs/common/protobuf/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(protobuf_udf)
+YQL_UDF_CONTRIB(protobuf_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/yql/essentials/udfs/common/re2/ya.make b/yql/essentials/udfs/common/re2/ya.make
index 001a708327..7e55413348 100644
--- a/yql/essentials/udfs/common/re2/ya.make
+++ b/yql/essentials/udfs/common/re2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(re2_udf)
+YQL_UDF_CONTRIB(re2_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/set/ya.make b/yql/essentials/udfs/common/set/ya.make
index bf2040b1dc..9c235a3084 100644
--- a/yql/essentials/udfs/common/set/ya.make
+++ b/yql/essentials/udfs/common/set/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(set_udf)
+YQL_UDF_CONTRIB(set_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/stat/ya.make b/yql/essentials/udfs/common/stat/ya.make
index 9aa5bc3bec..aee1fe4362 100644
--- a/yql/essentials/udfs/common/stat/ya.make
+++ b/yql/essentials/udfs/common/stat/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(stat_udf)
+YQL_UDF_CONTRIB(stat_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/streaming/ya.make b/yql/essentials/udfs/common/streaming/ya.make
index b87287e62b..9b080a7f86 100644
--- a/yql/essentials/udfs/common/streaming/ya.make
+++ b/yql/essentials/udfs/common/streaming/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(streaming_udf)
+YQL_UDF_CONTRIB(streaming_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/yql/essentials/udfs/common/string/ya.make b/yql/essentials/udfs/common/string/ya.make
index 11487b3609..80d2270b32 100644
--- a/yql/essentials/udfs/common/string/ya.make
+++ b/yql/essentials/udfs/common/string/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(string_udf)
+YQL_UDF_CONTRIB(string_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/top/ya.make b/yql/essentials/udfs/common/top/ya.make
index 6c3cbef4a0..4a8cdf859e 100644
--- a/yql/essentials/udfs/common/top/ya.make
+++ b/yql/essentials/udfs/common/top/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(top_udf)
+YQL_UDF_CONTRIB(top_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/topfreq/ya.make b/yql/essentials/udfs/common/topfreq/ya.make
index 94cc834ea9..ded936ca26 100644
--- a/yql/essentials/udfs/common/topfreq/ya.make
+++ b/yql/essentials/udfs/common/topfreq/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(topfreq_udf)
+YQL_UDF_CONTRIB(topfreq_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/unicode_base/ya.make b/yql/essentials/udfs/common/unicode_base/ya.make
index 15c2288ca7..53a8f3af45 100644
--- a/yql/essentials/udfs/common/unicode_base/ya.make
+++ b/yql/essentials/udfs/common/unicode_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(unicode_udf)
+YQL_UDF_CONTRIB(unicode_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/url_base/ya.make b/yql/essentials/udfs/common/url_base/ya.make
index 89e15dbe32..a251b5cf0d 100644
--- a/yql/essentials/udfs/common/url_base/ya.make
+++ b/yql/essentials/udfs/common/url_base/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(url_udf)
+YQL_UDF_CONTRIB(url_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/common/yson2/ya.make b/yql/essentials/udfs/common/yson2/ya.make
index dc5150ad41..3686722314 100644
--- a/yql/essentials/udfs/common/yson2/ya.make
+++ b/yql/essentials/udfs/common/yson2/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(yson2_udf)
+YQL_UDF_CONTRIB(yson2_udf)
     
     YQL_ABI_VERSION(
         2
diff --git a/yql/essentials/udfs/examples/callables/ya.make b/yql/essentials/udfs/examples/callables/ya.make
index 03f0b5fd71..63e1965799 100644
--- a/yql/essentials/udfs/examples/callables/ya.make
+++ b/yql/essentials/udfs/examples/callables/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(callables_udf)
+YQL_UDF_CONTRIB(callables_udf)
 YQL_ABI_VERSION(2 38 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/examples/dicts/ya.make b/yql/essentials/udfs/examples/dicts/ya.make
index b6c98aa164..4dd62e36e9 100644
--- a/yql/essentials/udfs/examples/dicts/ya.make
+++ b/yql/essentials/udfs/examples/dicts/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(dicts_udf)
+YQL_UDF_CONTRIB(dicts_udf)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/examples/dummylog/ya.make b/yql/essentials/udfs/examples/dummylog/ya.make
index 5b9cd3ee12..d1acd15945 100644
--- a/yql/essentials/udfs/examples/dummylog/ya.make
+++ b/yql/essentials/udfs/examples/dummylog/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(dummylog)
+YQL_UDF_CONTRIB(dummylog)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/examples/lists/ya.make b/yql/essentials/udfs/examples/lists/ya.make
index 5fcc4beb80..3fa002c780 100644
--- a/yql/essentials/udfs/examples/lists/ya.make
+++ b/yql/essentials/udfs/examples/lists/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(lists_udf)
+YQL_UDF_CONTRIB(lists_udf)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/examples/structs/ya.make b/yql/essentials/udfs/examples/structs/ya.make
index 1818543dbc..2339cf0b27 100644
--- a/yql/essentials/udfs/examples/structs/ya.make
+++ b/yql/essentials/udfs/examples/structs/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(structs_udf)
+YQL_UDF_CONTRIB(structs_udf)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/examples/tagged/ya.make b/yql/essentials/udfs/examples/tagged/ya.make
index ef5eecaee9..2afb4f4d42 100644
--- a/yql/essentials/udfs/examples/tagged/ya.make
+++ b/yql/essentials/udfs/examples/tagged/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(tagged_udf)
+YQL_UDF_CONTRIB(tagged_udf)
 YQL_ABI_VERSION(2 21 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/examples/type_inspection/ya.make b/yql/essentials/udfs/examples/type_inspection/ya.make
index d771b4f264..7ce6c1b26d 100644
--- a/yql/essentials/udfs/examples/type_inspection/ya.make
+++ b/yql/essentials/udfs/examples/type_inspection/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(type_inspection_udf)
+YQL_UDF_CONTRIB(type_inspection_udf)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/logs/dsv/ya.make b/yql/essentials/udfs/logs/dsv/ya.make
index 15bdf62fc1..34e2929423 100644
--- a/yql/essentials/udfs/logs/dsv/ya.make
+++ b/yql/essentials/udfs/logs/dsv/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(dsv_udf)
+YQL_UDF_CONTRIB(dsv_udf)
 
 YQL_ABI_VERSION(
     2
diff --git a/yql/essentials/udfs/test/simple/ya.make b/yql/essentials/udfs/test/simple/ya.make
index fe79d88bcb..4a5f4c5b0f 100644
--- a/yql/essentials/udfs/test/simple/ya.make
+++ b/yql/essentials/udfs/test/simple/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(simple_udf)
+YQL_UDF_CONTRIB(simple_udf)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yql/essentials/udfs/test/test_import/ya.make b/yql/essentials/udfs/test/test_import/ya.make
index 273c596936..1adb06149f 100644
--- a/yql/essentials/udfs/test/test_import/ya.make
+++ b/yql/essentials/udfs/test/test_import/ya.make
@@ -1,4 +1,4 @@
-YQL_UDF(test_import_udf)
+YQL_UDF_CONTRIB(test_import_udf)
 YQL_ABI_VERSION(2 9 0)
 
 SRCS(
diff --git a/yt/yt/client/api/unittests/options_ut.cpp b/yt/yt/client/api/unittests/options_ut.cpp
index 07cb357413..5e157f9618 100644
--- a/yt/yt/client/api/unittests/options_ut.cpp
+++ b/yt/yt/client/api/unittests/options_ut.cpp
@@ -11,11 +11,10 @@
 #include <util/system/env.h>
 
 namespace NYT::NApi {
+namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// TODO(ignat): move these tests to yt/yt/client/api/options.h
-
 TEST(TClientOptionsTest, TokenFromFile)
 {
     TTempDir tmpDir;
@@ -82,4 +81,5 @@ TEST(TClientOptionsTest, AllowEmptyUser)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // namespace NYT::NClient::NCache
+} // namespace
+} // namespace NYT::NApi
diff --git a/yt/yt/client/cache/config.cpp b/yt/yt/client/cache/config.cpp
index 7ebaeed178..51549f7de7 100644
--- a/yt/yt/client/cache/config.cpp
+++ b/yt/yt/client/cache/config.cpp
@@ -27,4 +27,4 @@ TClientsCacheAuthentificationOptionsPtr TClientsCacheAuthentificationOptions::Ge
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // namespace NYT::NClient::NHedging::NRpc
+} // namespace NYT::NClient::NCache
diff --git a/yt/yt/client/cache/config.h b/yt/yt/client/cache/config.h
index 76d7d286b0..516a2e537f 100644
--- a/yt/yt/client/cache/config.h
+++ b/yt/yt/client/cache/config.h
@@ -44,4 +44,4 @@ DEFINE_REFCOUNTED_TYPE(TClientsCacheAuthentificationOptions)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-} // namespace NYT::NClient::NHedging::NRpc
+} // namespace NYT::NClient::NCache