Skip to content

Commit 81c6c7f

Browse files
committed
Merge pull request #21185 from ydb-platform/merge-libs-250716-0050
2 parents f3234e4 + 1959003 commit 81c6c7f

File tree

1,623 files changed

+872736
-79859
lines changed

Some content is hidden

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

1,623 files changed

+872736
-79859
lines changed

.github/config/muted_ya.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteSmall
2626
ydb/core/kqp/ut/batch_operations unittest.[*/*] chunk
2727
ydb/core/kqp/ut/data_integrity KqpDataIntegrityTrails.UpsertEvWriteQueryService-isOlap+useOltpSink
2828
ydb/core/kqp/ut/federated_query/large_results KqpScriptExecResults.ExecuteScriptWithLargeFile
29+
ydb/core/kqp/ut/federated_query/s3 KqpFederatedQuery.ExecuteScriptWithExternalTableResolve
2930
ydb/core/kqp/ut/federated_query/s3 unittest.sole chunk
3031
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingAsyncIndex
3132
ydb/core/kqp/ut/indexes KqpMultishardIndex.WriteIntoRenamingSyncIndex

build/conf/docs.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ TOUCH_DOCS_MF=$TOUCH_DOCS && $GENERATE_MF
1111
###
1212
### Copy files from src_dir to $BINDIR/dst_dir
1313
macro DOCS_COPY_FILES(FROM="${CURDIR}", NAMESPACE=".", FILES...) {
14-
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/copy_docs_files.py"} ${hide;input:"build/scripts/process_command_files.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --src-dir $FROM --dst-dir $BINDIR/$NAMESPACE $FILES ${hide;context=TEXT;input=TEXT;pre=${FROM}/:FILES} ${hide;output;pre=${NAMESPACE}/:FILES}
14+
.CMD=$YMAKE_PYTHON3 ${input:"build/scripts/copy_docs_files.py"} ${hide;input:"build/scripts/process_command_files.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --src-dir $FROM --dst-dir $BINDIR/$NAMESPACE $FILES ${hide;context=TEXT;input=TEXT;pre=${FROM}/:FILES} ${hide;output;pre=${NAMESPACE}/:FILES} $_DOCS_KV
1515
.STRUCT_CMD=yes
1616
}
1717

build/conf/go.conf

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ GOSTD_VERSION=1.23
6969
when ($GOSTD_VERSION == "1.23") {
7070
GOSTD=contrib/go/_std_1.23/src
7171
}
72+
elsewhen ($GOSTD_VERSION == "1.24") {
73+
GOSTD=contrib/go/_std_1.24/src
74+
}
7275
otherwise {
7376
GOSTD=__unsupported_go_std_library_version_[$GOSTD_VERSION]__
7477
}
@@ -205,7 +208,7 @@ _GO_TOOL_COMMON_FLAGS=\
205208

206209
# tag:go-specific
207210
macro _GO_GEN_COVER_GO(GO_FILE, GO_COVER_OUTPUT, VAR_ID) {
208-
.CMD=${hide:_GO_FAKEID} ${cwd;rootdir;input:GO_FILE} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;suf=.cover.go;noext:GO_COVER_OUTPUT} ${rootrel;input:GO_FILE}
211+
.CMD=${hide:_GO_FAKEID} ${cwd;rootdir;input:GO_FILE} $GO_TOOLS_ROOT/pkg/tool/$_GO_TC_PATH/cover -mode set -var $VAR_ID -o ${output;suf=.cover.go;noext:GO_COVER_OUTPUT} ${rootrel;input:GO_FILE} ${hide;kv:"p go"} ${hide;kv:"pc light-blue"}
209212
}
210213

211214
# tag:go-specific
@@ -1058,6 +1061,7 @@ _GO_MODULES_TXT=${ARCADIA_ROOT}/vendor/modules.txt
10581061
_GO_TOOL_MOCKGEN=vendor/go.uber.org/mock/mockgen
10591062
_GO_TOOL_REFLECTOR=library/go/mockgen/reflector
10601063
_GO_TOOL_OAPI_CODEGEN=vendor/github.com/deepmap/oapi-codegen/cmd/oapi-codegen
1064+
_GO_TOOL_OAPI_CODEGEN_V2=vendor/github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
10611065
_GO_TOOL_OAPI_CODEGEN_TAXI=taxi/infra/go/platform/tools/pkg/deepmap/oapi-codegen/cmd/oapi-codegen
10621066
_GO_TOOL_OAPI_CODEGEN_TAXI_1134=taxi/infra/go/platform/tools/pkg1134/oapi-codegen-1.13.4/cmd/oapi-codegen
10631067

@@ -1180,6 +1184,23 @@ macro GO_OAPI_CODEGEN(GENERATE, PACKAGE, IN, IN_NOPARSE[], Args...) {
11801184
_GO_OAPI_CODEGEN_IMPL(${_GO_TOOL_OAPI_CODEGEN} ${IN} ${suf=.gen.go:GENERATE} GENERATE ${GENERATE} PACKAGE ${PACKAGE} ${Args} IN_NOPARSE ${IN_NOPARSE})
11811185
}
11821186

1187+
# tag:go-specific
1188+
### @usage: GO_OAPI_CODEGEN_V2(GENERATE, PACKAGE, IN, IN_NOPARSE[], Args...)
1189+
###
1190+
### Go oapi-codegen (v2) module
1191+
### Generates GENERATE thing with PACKAGE package from file IN into STDOUT file
1192+
### Optional arguments will be passed into generator
1193+
### IN_NOPARSE - input files required for running generation, except IN
1194+
### Can be placed multiple times in same ya.make
1195+
###
1196+
### PEERDIRs to dependencies of the generated code must be added manually.
1197+
### All possible dependencies are listed in:
1198+
### vendor/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen/templates/imports.tmpl
1199+
### For example, see devtools/dummy_arcadia/go/oapi-codegen-v2
1200+
macro GO_OAPI_CODEGEN_V2(GENERATE, PACKAGE, IN, IN_NOPARSE[], Args...) {
1201+
_GO_OAPI_CODEGEN_IMPL(${_GO_TOOL_OAPI_CODEGEN_V2} ${IN} ${suf=.gen.go:GENERATE} GENERATE ${GENERATE} PACKAGE ${PACKAGE} ${Args} IN_NOPARSE ${IN_NOPARSE})
1202+
}
1203+
11831204
# tag:go-specific
11841205
### private, taxi only
11851206
macro GO_OAPI_CODEGEN_TAXI(GENERATE, PACKAGE, IN, IN_NOPARSE[], OUT_SUFFIX="", Args...) {

build/conf/java.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -674,10 +674,10 @@ module JAVA_CONTRIB: _JAR_BASE {
674674
}
675675
otherwise {
676676
when ($LOCAL_JAR_PATH) {
677-
FETCH_TARGET_JAR= && $FS_TOOLS copy ${input:LOCAL_JAR_PATH} $TARGET
677+
FETCH_TARGET_JAR= && $FS_TOOLS copy ${input:LOCAL_JAR_PATH} $TARGET ${hide;kv:"p FS"} ${hide;kv:"pc yellow"}
678678
}
679679
otherwise {
680-
FETCH_TARGET_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:BINDIR} $JDK_RESOURCE/bin/jar cfvm $TARGET $VCS_JAVA .
680+
FETCH_TARGET_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && ${cwd:BINDIR} $JDK_RESOURCE/bin/jar cfvm $TARGET $VCS_JAVA . ${hide;kv:"p FS"} ${hide;kv:"pc yellow"}
681681
PEERDIR+=build/platform/java/jdk
682682
PEERDIR+=$JDK_RESOURCE_PEERDIR
683683
}
@@ -687,10 +687,10 @@ module JAVA_CONTRIB: _JAR_BASE {
687687
}
688688
otherwise {
689689
when ($LOCAL_SOURCES_JAR_PATH) {
690-
FETCH_SRCS_JAR= && $FS_TOOLS copy ${input:LOCAL_SOURCES_JAR_PATH} ${output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME}
690+
FETCH_SRCS_JAR= && $FS_TOOLS copy ${input:LOCAL_SOURCES_JAR_PATH} ${output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME} ${hide;kv:"p FS"} ${hide;kv:"pc yellow"}
691691
}
692692
otherwise {
693-
FETCH_SRCS_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && $FS_TOOLS md ${BINDIR}/fake-src && ${cwd;suf=/fake-src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME} $VCS_JAVA .
693+
FETCH_SRCS_JAR= && $GENERATE_VCS_JAVA_INFO_NODEP && $FS_TOOLS md ${BINDIR}/fake-src && ${cwd;suf=/fake-src:BINDIR} $JDK_RESOURCE/bin/jar cfvm ${output;pre=${BINDIR}/;suf=-sources.jar:REALPRJNAME} $VCS_JAVA . ${hide;kv:"p FS"} ${hide;kv:"pc yellow"}
694694
PEERDIR+=build/platform/java/jdk
695695
PEERDIR+=$JDK_RESOURCE_PEERDIR
696696
}
@@ -2091,6 +2091,7 @@ macro WITH_KOTLINC_DETEKT(Options...) {
20912091
# tag:kotlin-specific
20922092
### Also search for _KAPT_OPTS and change version there
20932093
### change supported jvmTarget in https://a.yandex-team.ru/arcadia/devtools/ya/jbuild/gen/actions/idea.py?rev=r16258919#L668
2094+
### change https://a.yandex-team.ru/arcadia/devtools/ya/jbuild/idea_templates/kotlinc.xml?rev=r17017283
20942095
_KOTLIN_VERSION=2.1.21
20952096
KOTLIN_VERSION=2.1.21
20962097
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/2.1.21/ya.dependency_management.inc

build/conf/proto.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ macro _COMPILE_LIST_PROTO(SRC) {
673673

674674
# tag:proto
675675
macro _PROTO_DESC_RAWPROTO_CMD(File) {
676-
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${norel;output;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${rootrel;input:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}
676+
.CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${norel;output;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${rootrel;input:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID} ${hide;kv:"p PD"} ${hide;kv:"pc light-cyan"}
677677
}
678678

679679
_PROTO_DESC_MERGE_CMD=$YMAKE_PYTHON3 ${input:"build/scripts/merge_files.py"} $TARGET ${ext=.desc:AUTO_INPUT} ${hide;kv:"p PD"} ${hide;kv:"pc light-cyan"} && ${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/collect_rawproto.py"} --output ${output;suf=.protosrc:REALPRJNAME} ${rootrel;ext=.rawproto:AUTO_INPUT}
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:9134846356"
4+
"uri": "sbr:9189996113"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:9134845402"
7+
"uri": "sbr:9189994273"
88
},
99
"linux": {
10-
"uri": "sbr:9134847582"
10+
"uri": "sbr:9189998716"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:9134844005"
13+
"uri": "sbr:9189992882"
1414
},
1515
"win32": {
16-
"uri": "sbr:9134847069"
16+
"uri": "sbr:9189997453"
1717
}
1818
}
1919
}
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:9134847636"
4+
"uri": "sbr:9189991566"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:9134847194"
7+
"uri": "sbr:9189990256"
88
},
99
"linux": {
10-
"uri": "sbr:9134848889"
10+
"uri": "sbr:9189994200"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:9134846549"
13+
"uri": "sbr:9189989140"
1414
},
1515
"win32": {
16-
"uri": "sbr:9134848417"
16+
"uri": "sbr:9189992529"
1717
}
1818
}
1919
}

build/mapping.conf.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@
577577
"9116226487": "{registry_endpoint}/9116226487",
578578
"9150817338": "{registry_endpoint}/9150817338",
579579
"9180813918": "{registry_endpoint}/9180813918",
580+
"9196630884": "{registry_endpoint}/9196630884",
580581
"5486731632": "{registry_endpoint}/5486731632",
581582
"5514350352": "{registry_endpoint}/5514350352",
582583
"5514360398": "{registry_endpoint}/5514360398",
@@ -816,6 +817,7 @@
816817
"8972534424": "{registry_endpoint}/8972534424",
817818
"9023067054": "{registry_endpoint}/9023067054",
818819
"9134846356": "{registry_endpoint}/9134846356",
820+
"9189996113": "{registry_endpoint}/9189996113",
819821
"5766171800": "{registry_endpoint}/5766171800",
820822
"5805430761": "{registry_endpoint}/5805430761",
821823
"5829025456": "{registry_endpoint}/5829025456",
@@ -906,6 +908,7 @@
906908
"8972533338": "{registry_endpoint}/8972533338",
907909
"9023066483": "{registry_endpoint}/9023066483",
908910
"9134845402": "{registry_endpoint}/9134845402",
911+
"9189994273": "{registry_endpoint}/9189994273",
909912
"5766173070": "{registry_endpoint}/5766173070",
910913
"5805432830": "{registry_endpoint}/5805432830",
911914
"5829031598": "{registry_endpoint}/5829031598",
@@ -996,6 +999,7 @@
996999
"8972536518": "{registry_endpoint}/8972536518",
9971000
"9023067958": "{registry_endpoint}/9023067958",
9981001
"9134847582": "{registry_endpoint}/9134847582",
1002+
"9189998716": "{registry_endpoint}/9189998716",
9991003
"5766171341": "{registry_endpoint}/5766171341",
10001004
"5805430188": "{registry_endpoint}/5805430188",
10011005
"5829023352": "{registry_endpoint}/5829023352",
@@ -1086,6 +1090,7 @@
10861090
"8972533033": "{registry_endpoint}/8972533033",
10871091
"9023066082": "{registry_endpoint}/9023066082",
10881092
"9134844005": "{registry_endpoint}/9134844005",
1093+
"9189992882": "{registry_endpoint}/9189992882",
10891094
"8270821739": "{registry_endpoint}/8270821739",
10901095
"8295446553": "{registry_endpoint}/8295446553",
10911096
"8326170338": "{registry_endpoint}/8326170338",
@@ -1106,6 +1111,7 @@
11061111
"8972535583": "{registry_endpoint}/8972535583",
11071112
"9023067572": "{registry_endpoint}/9023067572",
11081113
"9134847069": "{registry_endpoint}/9134847069",
1114+
"9189997453": "{registry_endpoint}/9189997453",
11091115
"5766172695": "{registry_endpoint}/5766172695",
11101116
"5805432230": "{registry_endpoint}/5805432230",
11111117
"5829029743": "{registry_endpoint}/5829029743",
@@ -2094,6 +2100,7 @@
20942100
"9116226487": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20952101
"9150817338": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20962102
"9180813918": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2103+
"9196630884": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
20972104
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20982105
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
20992106
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -2333,6 +2340,7 @@
23332340
"8972534424": "devtools/ymake/bin/ymake for darwin",
23342341
"9023067054": "devtools/ymake/bin/ymake for darwin",
23352342
"9134846356": "devtools/ymake/bin/ymake for darwin",
2343+
"9189996113": "devtools/ymake/bin/ymake for darwin",
23362344
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
23372345
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
23382346
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2423,6 +2431,7 @@
24232431
"8972533338": "devtools/ymake/bin/ymake for darwin-arm64",
24242432
"9023066483": "devtools/ymake/bin/ymake for darwin-arm64",
24252433
"9134845402": "devtools/ymake/bin/ymake for darwin-arm64",
2434+
"9189994273": "devtools/ymake/bin/ymake for darwin-arm64",
24262435
"5766173070": "devtools/ymake/bin/ymake for linux",
24272436
"5805432830": "devtools/ymake/bin/ymake for linux",
24282437
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2513,6 +2522,7 @@
25132522
"8972536518": "devtools/ymake/bin/ymake for linux",
25142523
"9023067958": "devtools/ymake/bin/ymake for linux",
25152524
"9134847582": "devtools/ymake/bin/ymake for linux",
2525+
"9189998716": "devtools/ymake/bin/ymake for linux",
25162526
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
25172527
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
25182528
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2603,6 +2613,7 @@
26032613
"8972533033": "devtools/ymake/bin/ymake for linux-aarch64",
26042614
"9023066082": "devtools/ymake/bin/ymake for linux-aarch64",
26052615
"9134844005": "devtools/ymake/bin/ymake for linux-aarch64",
2616+
"9189992882": "devtools/ymake/bin/ymake for linux-aarch64",
26062617
"8270821739": "devtools/ymake/bin/ymake for win32",
26072618
"8295446553": "devtools/ymake/bin/ymake for win32",
26082619
"8326170338": "devtools/ymake/bin/ymake for win32",
@@ -2623,6 +2634,7 @@
26232634
"8972535583": "devtools/ymake/bin/ymake for win32",
26242635
"9023067572": "devtools/ymake/bin/ymake for win32",
26252636
"9134847069": "devtools/ymake/bin/ymake for win32",
2637+
"9189997453": "devtools/ymake/bin/ymake for win32",
26262638
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
26272639
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
26282640
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",

build/platform/linux_sdk/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ ELSEIF (ARCH_X86_64)
2323
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT ${OS_SDK_SBR})
2424
ELSEIF (OS_SDK == "ubuntu-22")
2525
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:6495397322)
26+
ELSEIF (OS_SDK == "ubuntu-24")
27+
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:9213417189)
2628
ELSE()
2729
MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for x86-64")
2830
ENDIF()
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:9180894618)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9196648327)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9180891807)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9196647725)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9180899616)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9196650022)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9180889439)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9196646940)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9180897337)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9196648771)
1111

1212
ENDIF()

0 commit comments

Comments
 (0)