Skip to content

Commit ad0b833

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #15226 from ydb-platform/merge-libs-250302-1120
2 parents 31ac77e + 040bd40 commit ad0b833

File tree

307 files changed

+14150
-17715
lines changed

Some content is hidden

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

307 files changed

+14150
-17715
lines changed

‎.github/config/muted_ya.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ydb/library/actors/http/ut sole chunk chunk
8585
ydb/library/actors/http/ut sole+chunk+chunk
8686
ydb/library/actors/interconnect/ut_huge_cluster HugeCluster.AllToAll
8787
ydb/library/actors/interconnect/ut_huge_cluster sole chunk chunk
88+
ydb/library/yaml_config/ut_transform test_transform.py.TestYamlConfigTransformations.test_basic[args1-dump_ds_init]
8889
ydb/library/yql/dq/opt/ut HypergraphBuild.JoinTopologiesBenchmark
8990
ydb/library/yql/dq/opt/ut sole chunk chunk
9091
ydb/library/yql/providers/generic/connector/tests/datasource/ydb test.py.test_select_positive[column_selection_col2_COL1-kqprun]
@@ -179,8 +180,8 @@ ydb/tests/olap/ttl_tiering data_correctness.py.TestDataCorrectness.test
179180
ydb/tests/olap/ttl_tiering data_migration_when_alter_ttl.py.TestDataMigrationWhenAlterTtl.test
180181
ydb/tests/olap/ttl_tiering sole chunk chunk
181182
ydb/tests/olap/ttl_tiering ttl_delete_s3.py.TestDeleteS3Ttl.test_data_unchanged_after_ttl_change
182-
ydb/tests/olap/ttl_tiering ttl_delete_s3.py.TestDeleteS3Ttl.test_ttl_delete
183183
ydb/tests/olap/ttl_tiering ttl_delete_s3.py.TestDeleteS3Ttl.test_delete_s3_tiering
184+
ydb/tests/olap/ttl_tiering ttl_delete_s3.py.TestDeleteS3Ttl.test_ttl_delete
184185
ydb/tests/olap/ttl_tiering ttl_unavailable_s3.py.TestUnavailableS3.test
185186
ydb/tests/olap/ttl_tiering unstable_connection.py.TestUnstableConnection.test
186187
ydb/tests/postgres_integrations/go-libpq [docker_wrapper_test.py] chunk chunk

‎build/conf/docs.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ _DOCS_YFM_CMD=$_DOCS_YFM_CMD_IMPL($_DOCS_CONFIG_VALUE EXTRA_INPUTS $_DOCS_EXTRA_
5353
### should be defined here.
5454
module _DOCS_BARE_UNIT: _BARE_UNIT {
5555
.ALLOWED=DOCS_DIR DOCS_CONFIG DOCS_VARS
56-
.CMD=TOUCH_DOCS_MF
56+
.CMD=$TOUCH_DOCS_MF
57+
.STRUCT_CMD=yes
5758
.FINAL_TARGET=no
5859
.NODE_TYPE=Bundle
5960
.PEERDIR_POLICY=as_include
@@ -82,7 +83,7 @@ _DOCS_LIBRARY_CMD=$_DOCS_LIBRARY_CMD_IMPL(SOURCES $_DOCS_SOURCES_VALUE INCLUDE_S
8283

8384
# tag:docs
8485
module DOCS_LIBRARY: _DOCS_BARE_UNIT {
85-
.CMD=_DOCS_LIBRARY_CMD
86+
.CMD=$_DOCS_LIBRARY_CMD
8687
.ALIASES=SRCS=_DOCS_SRCS DOCS_DIR=_YFM_DOCS_DIR
8788
.EPILOGUE=_DOCS_LIBRARY_EPILOGUE
8889
.NODE_TYPE=Library
@@ -150,7 +151,7 @@ macro _DOCS_YFM_USE_PLANTUML() {
150151
### @see: [DOCS_DIR()](#macro_DOCS_DIR), [DOCS_CONFIG()](#macro_DOCS_CONFIG), [DOCS_VARS()](#macro_DOCS_VARS).
151152
multimodule DOCS {
152153
module DOCSBOOK: _DOCS_BASE_UNIT {
153-
.CMD=_DOCS_YFM_CMD
154+
.CMD=$_DOCS_YFM_CMD
154155
.FINAL_TARGET=yes
155156
.PEERDIR_POLICY=as_build_from
156157
.IGNORED=DOCS_DIR DOCS_INCLUDE_SOURCES DOCS_COPY_FILES PEERDIR PYTHON RUN_PROGRAM RUN_PYTHON3 RUN_LUA RUN_JAVA_PROGRAM FROM_SANDBOX SRCS COPY COPY_FILE FILES
@@ -167,7 +168,7 @@ multimodule DOCS {
167168
}
168169

169170
module DOCSLIB: _DOCS_BASE_UNIT {
170-
.CMD=_DOCS_YFM_CMD
171+
.CMD=$_DOCS_YFM_CMD
171172
.PEERDIR_POLICY=as_build_from
172173
.IGNORED=DOCS_DIR DOCS_INCLUDE_SOURCES DOCS_COPY_FILES PEERDIR PYTHON RUN_PROGRAM RUN_PYTHON3 RUN_LUA RUN_JAVA_PROGRAM FROM_SANDBOX SRCS COPY COPY_FILE FILES
173174
.PEERDIRSELF=DOCSLIB_INTERNAL

‎build/conf/go.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,5 +1022,5 @@ macro GO_MOCKGEN_MOCKS() {
10221022
PEERDIR(vendor/go.uber.org/mock/gomock)
10231023

10241024
# Unfortunately ${rootrel;tool:TOOL} doesn't work currently, so we use this ugly workaround $MODDIR/gen/gen$_GO_EXE_SUFFIX
1025-
RUN_PROGRAM(vendor/go.uber.org/mock/mockgen -package mocks -exec_only $MODDIR/gen/gen$_GO_EXE_SUFFIX ${GO_ARCADIA_PROJECT_PREFIX}${MOCKGEN_FROM} $MOCKGEN_TYPES STDOUT main.go TOOL $MODDIR/gen CWD $ARCADIA_BUILD_ROOT)
1025+
RUN_PROGRAM(vendor/go.uber.org/mock/mockgen -package mocks -exec_only $MODDIR/gen/gen$_GO_EXE_SUFFIX ${GO_ARCADIA_PROJECT_PREFIX}${MOCKGEN_FROM} $MOCKGEN_TYPES STDOUT main.go TOOL $MODDIR/gen CWD $ARCADIA_BUILD_ROOT ENV PATH=${GO_TOOLS_ROOT}/bin GOROOT=${GO_TOOLS_ROOT} GOCACHE=${BINDIR}/.gocache)
10261026
}

‎build/conf/java.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,11 +451,6 @@ macro DEFAULT_JUNIT_JAVA_SRCS_LAYOUT() {
451451
FULL_JAVA_SRCS(RESOURCES SRCDIR resources **/* SKIP_CHECK_SRCDIR)
452452
}
453453

454-
macro _HASH_HELPER(Args...) {
455-
.CMD=${hash:Args}
456-
.SEM=${hash:Args}
457-
}
458-
459454
macro _GENTAR_HELPER(HASH_SUF="hash_suf", OUT_DIR[]) {
460455
.CMD=${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/autotar_gendirs.py"} --pack ${OUT_DIR} --outs ${output;tared;suf=$HASH_SUF:OUT_DIR} ${hide;kv:"tared_kind nodir"}
461456
.SEM=${hide;suf=$HASH_SUF;tared;output:OUT_DIR}

‎build/conf/opensource.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") {
4141
EXPORT_SEM=yes
4242
EXPORTED_BUILD_SYSTEM_SOURCE_ROOT=${"$"}{PROJECT_SOURCE_DIR}
4343
EXPORTED_BUILD_SYSTEM_BUILD_ROOT=${"$"}{PROJECT_BINARY_DIR}
44+
}
45+
46+
when ($EXPORT_GRADLE == "yes") {
4447
EXPORT_LANG=JAVA
4548
}
4649

@@ -58,6 +61,9 @@ when ($OPENSOURCE == "yes" && $EXPORT_CMAKE == "yes") {
5861
EXPORT_SEM=yes
5962
EXPORTED_BUILD_SYSTEM_SOURCE_ROOT="${PROJECT_SOURCE_DIR}"
6063
EXPORTED_BUILD_SYSTEM_BUILD_ROOT="${PROJECT_BINARY_DIR}"
64+
}
65+
66+
when ($EXPORT_CMAKE == "yes") {
6167
EXPORT_LANG=CPP
6268
}
6369

‎build/conf/python.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ multimodule PY3_PROGRAM {
267267
# Notify pybuild to skip all python main function definitions
268268
ENABLE(IGNORE_PY_MAIN)
269269
NO_CLANG_TIDY()
270+
DISABLE(START_TARGET)
270271
}
271272
}
272273

@@ -435,6 +436,7 @@ multimodule PY3TEST {
435436
PEERDIR+=library/python/pytest
436437
_DONT_REQUIRE_LICENSE()
437438
WITHOUT_VERSION()
439+
DISABLE(START_TARGET)
438440
}
439441
}
440442

‎build/conf/settings.conf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11
JSON_CACHE_IS_ATTACHED=yes
22
LANGS_REQUIRE_BUILD_AND_SRC_ROOTS=c asm cython proto flatc swig ydl nlg
3-
CHECK_GO_INCORRECT_DEPS=yes
43
USE_PREBUILT_TOOLS=yes
54
RESOLVE_FORCE_LISTDIR=no
6-
ENABLE_NODE_SELF_UID=yes
75
REPORT_CONFIGURE_PROGRESS=yes
8-
FORCE_RESOLVE_MACRO_INCLS=yes
9-
ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
106
REPORT_ALL_DUPSRC=yes
117
DEPS_CACHE_CONTROL_UIDS_CACHE=yes
128
USE_GLOBAL_CMD=yes
139
PIC_NO_PIE=no
1410
FAIL_PY2=no
1511
MAIN_OUTPUT_AS_EXTRA=yes
16-
USE_REACHABILITY_TO_REPORT_CONF_ERRORS = yes
1712
DISABLE_ATD=yes
1813

1914
when ($OS_WINDOWS == "yes") {

‎build/plugins/_dart_fields.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,20 @@ class TestFiles:
11371137
# https://a.yandex-team.ru/arcadia/devtools/ya/test/dartfile/__init__.py?rev=r14292146#L10
11381138
KEY2 = 'FILES'
11391139

1140+
_GRUT_PREFIX = 'grut'
1141+
_GRUT_INCLUDE_LINTER_TEST_PATHS = (
1142+
'grut/libs/bigrt/clients',
1143+
'grut/libs/bigrt/common',
1144+
'grut/libs/bigrt/data',
1145+
'grut/libs/bigrt/event_filter',
1146+
'grut/libs/bigrt/info_keepers',
1147+
'grut/libs/bigrt/processor',
1148+
'grut/libs/bigrt/profile',
1149+
'grut/libs/bigrt/profiles',
1150+
'grut/libs/bigrt/queue_info_config',
1151+
'grut/libs/shooter',
1152+
)
1153+
11401154
@classmethod
11411155
def value(cls, unit, flat_args, spec_args):
11421156
data_re = re.compile(r"sbr:/?/?(\d+)=?.*")
@@ -1230,6 +1244,13 @@ def py_linter_files(cls, unit, flat_args, spec_args):
12301244

12311245
@classmethod
12321246
def cpp_linter_files(cls, unit, flat_args, spec_args):
1247+
upath = unit.path()[3:]
1248+
if upath.startswith(cls._GRUT_PREFIX):
1249+
for path in cls._GRUT_INCLUDE_LINTER_TEST_PATHS:
1250+
if os.path.commonpath([upath, path]) == path:
1251+
break
1252+
else:
1253+
raise DartValueError()
12331254
files_dart = _reference_group_var("ALL_SRCS", consts.STYLE_CPP_ALL_EXTS)
12341255
return {cls.KEY: files_dart, cls.KEY2: files_dart}
12351256

‎build/plugins/lib/test_const/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@
181181
NYC_RESOURCE = 'NYC_RESOURCE_GLOBAL'
182182
RUFF_RESOURCE = 'RUFF_RESOURCE_GLOBAL'
183183
CLANG_FORMAT_RESOURCE = 'CLANG_FORMAT_RESOURCE_GLOBAL'
184+
CLANG_FORMAT_15_RESOURCE = 'CLANG_FORMAT_15_RESOURCE_GLOBAL'
184185

185186
# test_tool resource for host platform.
186187
# source - build/platform/test_tool/host.ya.make.inc.

‎build/plugins/ytest.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,18 @@ def get_list(key):
141141
if valid_kw.get('SCRIPT-REL-PATH') == 'boost.test':
142142
project_path = valid_kw.get('BUILD-FOLDER-PATH', "")
143143
if not project_path.startswith(
144-
("contrib", "mail", "maps", "tools/idl", "metrika", "devtools", "mds", "yandex_io", "smart_devices")
144+
(
145+
"contrib",
146+
"mail",
147+
"maps",
148+
"mobile/geo/maps",
149+
"tools/idl",
150+
"metrika",
151+
"devtools",
152+
"mds",
153+
"yandex_io",
154+
"smart_devices",
155+
)
145156
):
146157
errors.append("BOOSTTEST is not allowed here")
147158

‎build/scripts/fetch_resource.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎build/scripts/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ IF (PY2)
1616
fetch_from_archive.py
1717
fetch_from_mds.py
1818
fetch_from_sandbox.py
19-
fetch_resource.py
2019
gen_java_codenav_entry.py
2120
gen_py3_reg.py
2221
go_tool.py

‎build/sysincl/emscripten.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108
- contrib/restricted/emscripten/system/lib/libc/musl/src/internal/syscall.h
109109
- contrib/restricted/emscripten/system/lib/libc/musl/arch/emscripten/bits/syscall.h
110110

111+
- syscall_arch.h:
112+
- contrib/restricted/emscripten/system/lib/libc/musl/arch/emscripten/syscall_arch.h
113+
111114
- inttypes.h: contrib/restricted/emscripten/system/lib/libc/musl/include/inttypes.h
112115
- stddef.h: contrib/restricted/emscripten/system/lib/libc/musl/include/stddef.h
113116
- stdint.h: contrib/restricted/emscripten/system/lib/libc/musl/include/stdint.h

‎build/ymake.core.conf

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,13 @@ macro CHECK_DEPENDENT_DIRS(TYPE, ALL?"UNUSED":"", PEERDIRS?"PEERDIRS":"ALL", RES
487487
SET_APPEND(CHECK_DEPENDENT_DIRS_TYPES $TYPE)
488488
}
489489

490+
macro _HASH_HELPER(Args...) {
491+
.CMD=${hash:Args}
492+
.SEM=${hash:Args}
493+
}
494+
490495
macro _RESOURCE_SEM(INPUTS[], KEYS[], OPTS[]) {
491-
SET(RESOURCE_OUTPUT ${hash:INPUTS}.cpp)
496+
SET(RESOURCE_OUTPUT $_HASH_HELPER($INPUTS $KEYS $OPTS).cpp)
492497
.SEM=target_macroses-ITEM && target_macroses-macro resources && target_macroses-args ${output;global:RESOURCE_OUTPUT} INPUTS ${input:INPUTS} KEYS $KEYS OPTS $OPTS ${hide;tool:"tools/rescompiler/bin"}
493498
}
494499

@@ -775,9 +780,15 @@ module _BASE_UNIT: _BARE_UNIT {
775780
when ($OS_EMSCRIPTEN == "yes") {
776781
when ($NOLIBC != "yes") {
777782
PEERDIR+=contrib/restricted/emscripten/include
783+
# Important: In arcadia we usually build standalone WASM applications,
784+
# so standalone library must go before lib/c in linker command-line.
785+
# Emscripten uses two weak definitions for __clock_gettime function,
786+
# so linker will pick one from the first library present in command
787+
# line.
788+
PEERDIR+=contrib/restricted/emscripten/system/lib/standalonewasm
789+
PEERDIR+=contrib/restricted/emscripten/system/lib/stubs
778790
PEERDIR+=contrib/restricted/emscripten/system/lib/c
779791
PEERDIR+=contrib/restricted/emscripten/system/lib/dlmalloc
780-
PEERDIR+=contrib/restricted/emscripten/system/lib/standalonewasm
781792
}
782793
}
783794

‎contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pkgs: attrs: with pkgs; rec {
2-
version = "2024-10-14";
3-
revision = "76435c4451aeb5e04e9500b090293347a38cef8d";
2+
version = "2025-02-25";
3+
revision = "a6f71cbc3a1e1b8b9df241e081fa0ffdcde96249";
44

55
src = fetchFromGitHub {
66
owner = "libcxxrt";
77
repo = "libcxxrt";
88
rev = "${revision}";
9-
hash = "sha256-U7mq79/0xbyRr2+KUMKgEvyd2lfr3Q5GrByt/8J9sC8=";
9+
hash = "sha256-+oTjU/DgOEIwJebSVkSEt22mJSdeONozB8FfzEiESHU=";
1010
};
1111

1212
nativeBuildInputs = [ cmake ];

0 commit comments

Comments
 (0)