Merge pull request #12299 from ydb-platform/mergelibs-241204-2036

Library import 241204-2036
ydb-platform · Dec 5, 2024 · d917bcb · d917bcb
2 parents e73a3e8 + ec82021
commit d917bcb
Show file tree

Hide file tree

Showing 58 changed files with 277 additions and 1,525 deletions.
diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf
@@ -39,13 +39,13 @@ module YQL_UDF_TEST: PY3TEST_BIN {
     PEERDIR(yql/essentials/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
+    DEPENDS(yql/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
     DATA(arcadia/yql/essentials/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
     ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
-    ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
+    ENV(YQL_YQLRUN_PATH="yql/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
     ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
 }
@@ -56,13 +56,13 @@ module YQL_UDF_YDB_TEST: PY3TEST_BIN {
     PEERDIR(yql/essentials/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
+    DEPENDS(yql/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
     DATA(arcadia/yql/essentials/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
     ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
-    ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
+    ENV(YQL_YQLRUN_PATH="yql/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
     ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
 }
@@ -73,13 +73,13 @@ module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
     PEERDIR(yql/essentials/tests/common/udf_test)
 
     DEPENDS(yql/essentials/tools/astdiff)
-    DEPENDS($YQL_BASE_TEST_DIR/tools/yqlrun)
+    DEPENDS(yql/tools/yqlrun)
     DEPENDS(yql/essentials/tools/udf_resolver)
     DATA(arcadia/yql/essentials/mount)
     DATA(arcadia/yql/essentials/cfg/udf_test)
     ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
     ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
-    ENV(YQL_YQLRUN_PATH="$YQL_BASE_TEST_DIR/tools/yqlrun/yqlrun")
+    ENV(YQL_YQLRUN_PATH="yql/tools/yqlrun/yqlrun")
     ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
     ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
 }

diff --git a/ydb/ci/rightlib.txt b/ydb/ci/rightlib.txt
@@ -1 +1 @@
-0ee4aa0bed96decb383c7ac2ffb9bcfa76188acd
+d2bd6dd9b9fd27437e1cf1de84fb2e439bb27146
diff --git a/ydb/library/yql/tests/sql/dq_file.make b/ydb/library/yql/tests/sql/dq_file.make
@@ -22,12 +22,10 @@ FORK_TESTS()
 FORK_SUBTESTS()
 SPLIT_FACTOR(10)
 
-ENV(YQL_YQLRUN_PATH="ydb/library/yql/tools/yqlrun/yqlrun")
-
 DEPENDS(
     yql/essentials/tools/astdiff
     ydb/library/yql/tools/dqrun
-    ydb/library/yql/tools/yqlrun
+    yql/tools/yqlrun
     yql/essentials/tests/common/test_framework/udfs_deps
     yql/essentials/udfs/test/test_import
 )

diff --git a/ydb/library/yql/tests/sql/hybrid_file.make b/ydb/library/yql/tests/sql/hybrid_file.make
@@ -22,12 +22,10 @@ FORK_TESTS()
 FORK_SUBTESTS()
 SPLIT_FACTOR(10)
 
-ENV(YQL_YQLRUN_PATH="ydb/library/yql/tools/yqlrun/yqlrun")
-
 DEPENDS(
     yql/essentials/tools/astdiff
     ydb/library/yql/tools/dqrun
-    ydb/library/yql/tools/yqlrun
+    yql/tools/yqlrun
     yql/essentials/tests/common/test_framework/udfs_deps
     yql/essentials/udfs/test/test_import
 )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0ee4aa0bed96decb383c7ac2ffb9bcfa76188acd
		d2bd6dd9b9fd27437e1cf1de84fb2e439bb27146