Skip to content

Commit c166bec

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #14412 from ydb-platform/merge-libs-250211-0050
2 parents e86276c + f992866 commit c166bec

File tree

272 files changed

+18683
-13497
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+18683
-13497
lines changed

‎build/conf/go.conf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@ GO_HOST_TARG_PARAMS=++host-os $GO_HOST_OS ++host-arch $GO_HOST_ARCH ++targ-os $G
6060

6161
# tag:go-specific
6262
GOSTD_VERSION=1.22
63-
when ($GOSTD_VERSION == "1.22") {
63+
when ($GOSTD_VERSION == "1.23") {
64+
GOSTD=contrib/go/_std_1.23/src
65+
}
66+
elsewhen ($GOSTD_VERSION == "1.22") {
6467
GOSTD=contrib/go/_std_1.22/src
6568
}
6669
otherwise {

‎build/conf/licenses.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
"Facebook-SDK",
228228
"FDK",
229229
"Fftpack-2004",
230+
"FreeBSD-DOC",
230231
"FSFAP",
231232
"FTL",
232233
"GPL-1.0-or-later WITH Linux-syscall-note",

‎build/conf/project_specific/yql_udf.conf‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,6 @@ module YQL_UDF_TEST: PY3TEST_BIN {
5050
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
5151
}
5252

53-
module YQL_UDF_YDB_TEST: PY3TEST_BIN {
54-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
55-
56-
PEERDIR(yql/essentials/tests/common/udf_test)
57-
58-
DEPENDS(yql/essentials/tools/astdiff)
59-
DEPENDS(yql/tools/yqlrun)
60-
DEPENDS(yql/essentials/tools/udf_resolver)
61-
DATA(arcadia/yql/essentials/mount)
62-
DATA(arcadia/yql/essentials/cfg/udf_test)
63-
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
64-
ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
65-
ENV(YQL_YQLRUN_PATH="yql/tools/yqlrun/yqlrun")
66-
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
67-
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
68-
}
69-
7053
module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
7154
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
7255

‎build/external_resources/ymake/public.resources.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:7949054326"
4+
"uri": "sbr:8000013577"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7949053519"
7+
"uri": "sbr:8000012780"
88
},
99
"linux": {
10-
"uri": "sbr:7949055512"
10+
"uri": "sbr:8000014871"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7949052736"
13+
"uri": "sbr:8000012216"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7949054892"
16+
"uri": "sbr:8000014239"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:7949059406"
4+
"uri": "sbr:8000017801"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7949058862"
7+
"uri": "sbr:8000017375"
88
},
99
"linux": {
10-
"uri": "sbr:7949061040"
10+
"uri": "sbr:8000018764"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:7949058277"
13+
"uri": "sbr:8000016896"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:7949060018"
16+
"uri": "sbr:8000018351"
1717
}
1818
}
1919
}

‎build/mapping.conf.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@
496496
"7903404398": "https://devtools-registry.s3.yandex.net/7903404398",
497497
"7914217459": "https://devtools-registry.s3.yandex.net/7914217459",
498498
"7948644946": "https://devtools-registry.s3.yandex.net/7948644946",
499+
"7994647367": "https://devtools-registry.s3.yandex.net/7994647367",
499500
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
500501
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
501502
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -685,6 +686,7 @@
685686
"7900623167": "https://devtools-registry.s3.yandex.net/7900623167",
686687
"7922609627": "https://devtools-registry.s3.yandex.net/7922609627",
687688
"7949054326": "https://devtools-registry.s3.yandex.net/7949054326",
689+
"8000013577": "https://devtools-registry.s3.yandex.net/8000013577",
688690
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
689691
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
690692
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -749,6 +751,7 @@
749751
"7900622686": "https://devtools-registry.s3.yandex.net/7900622686",
750752
"7922609038": "https://devtools-registry.s3.yandex.net/7922609038",
751753
"7949053519": "https://devtools-registry.s3.yandex.net/7949053519",
754+
"8000012780": "https://devtools-registry.s3.yandex.net/8000012780",
752755
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
753756
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
754757
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -813,6 +816,7 @@
813816
"7900624427": "https://devtools-registry.s3.yandex.net/7900624427",
814817
"7922610908": "https://devtools-registry.s3.yandex.net/7922610908",
815818
"7949055512": "https://devtools-registry.s3.yandex.net/7949055512",
819+
"8000014871": "https://devtools-registry.s3.yandex.net/8000014871",
816820
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
817821
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
818822
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -877,6 +881,7 @@
877881
"7900622150": "https://devtools-registry.s3.yandex.net/7900622150",
878882
"7922608408": "https://devtools-registry.s3.yandex.net/7922608408",
879883
"7949052736": "https://devtools-registry.s3.yandex.net/7949052736",
884+
"8000012216": "https://devtools-registry.s3.yandex.net/8000012216",
880885
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
881886
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
882887
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -941,6 +946,7 @@
941946
"7900623779": "https://devtools-registry.s3.yandex.net/7900623779",
942947
"7922610123": "https://devtools-registry.s3.yandex.net/7922610123",
943948
"7949054892": "https://devtools-registry.s3.yandex.net/7949054892",
949+
"8000014239": "https://devtools-registry.s3.yandex.net/8000014239",
944950
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
945951
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
946952
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1717,6 +1723,7 @@
17171723
"7903404398": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17181724
"7914217459": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17191725
"7948644946": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1726+
"7994647367": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17201727
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
17211728
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
17221729
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -1906,6 +1913,7 @@
19061913
"7900623167": "devtools/ymake/bin/ymake for darwin",
19071914
"7922609627": "devtools/ymake/bin/ymake for darwin",
19081915
"7949054326": "devtools/ymake/bin/ymake for darwin",
1916+
"8000013577": "devtools/ymake/bin/ymake for darwin",
19091917
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
19101918
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
19111919
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1970,6 +1978,7 @@
19701978
"7900622686": "devtools/ymake/bin/ymake for darwin-arm64",
19711979
"7922609038": "devtools/ymake/bin/ymake for darwin-arm64",
19721980
"7949053519": "devtools/ymake/bin/ymake for darwin-arm64",
1981+
"8000012780": "devtools/ymake/bin/ymake for darwin-arm64",
19731982
"5766173070": "devtools/ymake/bin/ymake for linux",
19741983
"5805432830": "devtools/ymake/bin/ymake for linux",
19751984
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2034,6 +2043,7 @@
20342043
"7900624427": "devtools/ymake/bin/ymake for linux",
20352044
"7922610908": "devtools/ymake/bin/ymake for linux",
20362045
"7949055512": "devtools/ymake/bin/ymake for linux",
2046+
"8000014871": "devtools/ymake/bin/ymake for linux",
20372047
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
20382048
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
20392049
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2098,6 +2108,7 @@
20982108
"7900622150": "devtools/ymake/bin/ymake for linux-aarch64",
20992109
"7922608408": "devtools/ymake/bin/ymake for linux-aarch64",
21002110
"7949052736": "devtools/ymake/bin/ymake for linux-aarch64",
2111+
"8000012216": "devtools/ymake/bin/ymake for linux-aarch64",
21012112
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
21022113
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
21032114
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -2162,6 +2173,7 @@
21622173
"7900623779": "devtools/ymake/bin/ymake for win32-clang-cl",
21632174
"7922610123": "devtools/ymake/bin/ymake for win32-clang-cl",
21642175
"7949054892": "devtools/ymake/bin/ymake for win32-clang-cl",
2176+
"8000014239": "devtools/ymake/bin/ymake for win32-clang-cl",
21652177
"4307890075": "flake8_linter for linux",
21662178
"5517245192": "flake8_linter for linux",
21672179
"4307901240": "flake8_linter for linux-aarch64",

‎build/platform/test_tool/host.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948640341)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994789266)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948639335)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994784587)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948643524)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994797288)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948638449)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994780427)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948641537)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994793586)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948642784)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994642530)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948641644)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994640050)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948644946)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994647367)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948640691)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994637838)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7948644187)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994644702)
1111

1212
ENDIF()

‎build/ymake.core.conf‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ otherwise {
199199
}
200200

201201
FAIL_MODULE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/fail_module_cmd.py"} $TARGET ${hide;kv:"p ER"} ${hide;kv:"pc red"}
202+
FAIL_EXPR=ERROR
202203
DEFAULT_TIDY_CONFIG=build/config/tests/clang_tidy/config.yaml
203204
PROJECT_TIDY_CONFIG=build/config/tests/clang_tidy/config.yaml
204205
TIDY=
@@ -1157,6 +1158,12 @@ module _BASE_PROGRAM: _LINK_UNIT {
11571158
SET(MODULE_LANG CPP)
11581159
FORCE_COVERAGE_ENABLED=yes
11591160

1161+
when ($OS_EMSCRIPTEN == "yes") {
1162+
# For WASM platforms at present we just check that code compiles successfully,
1163+
# these entries need to suppress linker errors.
1164+
LDFLAGS += -Wl,--no-entry
1165+
LDFLAGS += -Wl,--import-undefined
1166+
}
11601167
when ($OS_IOS == "yes") {
11611168
EXTS+=.ios.interface
11621169
}
@@ -1301,12 +1308,6 @@ module _BASE_UNITTEST: _BASE_PROGRAM {
13011308
when ($UT_SKIP_EXCEPTIONS == "yes") {
13021309
C_DEFINES+=-DUT_SKIP_EXCEPTIONS
13031310
}
1304-
when ($OS_EMSCRIPTEN == "yes") {
1305-
# For WASM platforms at present we just check that code compiles without errors,
1306-
# these entries just suppresses linker errors.
1307-
LDFLAGS += -Wl,--no-entry
1308-
LDFLAGS += -Wl,--import-undefined
1309-
}
13101311
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
13111312
# Assume that no code may depend on unit test output and thus
13121313
# do not mandate license markup in such modules.

‎build/ymake_conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2387,7 +2387,7 @@ def have_cuda_in_arcadia(self):
23872387
if not self.cuda_version.from_user:
23882388
return False
23892389

2390-
if self.cuda_version.value in ('11.4', '11.8', '12.1', '12.2', '12.6', '12.6.0'):
2390+
if self.cuda_version.value in ('11.4', '11.8', '12.1', '12.2', '12.6'):
23912391
return True
23922392
elif self.cuda_version.value in ('10.2', '11.4.19') and target.is_linux_armv8:
23932393
return True

0 commit comments

Comments
 (0)