Skip to content

Commit 52cd0e1

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #17513 from ydb-platform/merge-libs-250422-0050
2 parents 01a07bc + 0f949f8 commit 52cd0e1

File tree

114 files changed

+839
-300
lines changed

Some content is hidden

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

114 files changed

+839
-300
lines changed

‎build/conf/java.conf

+2
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,7 @@ MAVEN_DEPLOY_CMD=$YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} $MAVEN_
814814
MAVEN_EXPORT_CMD=
815815

816816
# tag:java-specific
817+
_GEN_EXTRA_METAINF=
817818
JAR_BUILD_SCRIPT_FLAGS_DELIM=DELIM
818819
JAR_BUILD_SCRIPT_FLAGS=
819820
JAVA_COVERAGE_SRCLIST_FLAG=--coverage ${output;pre=${MODULE_PREFIX};suf=.cpsf:REALPRJNAME} --source-root ${ARCADIA_ROOT}
@@ -840,6 +841,7 @@ LINK_JAR=${hide:JAVA_FAKEID} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide
840841
&& $_PREPARE_SRC_JAR \
841842
&& $ALL_KT_COMMANDS \
842843
&& $COLLECT_CLASSPATH \
844+
&& $_GEN_EXTRA_METAINF \
843845
&& $LINK_CLASSPATH \
844846
&& $COMPILE_JAVA_SRCLIST \
845847
&& $LINK_JAR_RESOURCES \

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8495998200"
4+
"uri": "sbr:8542905826"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8495996711"
7+
"uri": "sbr:8542904543"
88
},
99
"linux": {
10-
"uri": "sbr:8496000609"
10+
"uri": "sbr:8542907827"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8495995517"
13+
"uri": "sbr:8542903617"
1414
},
1515
"win32": {
16-
"uri": "sbr:8495999423"
16+
"uri": "sbr:8542906865"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8495981145"
4+
"uri": "sbr:8542902649"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8495980215"
7+
"uri": "sbr:8542901822"
88
},
99
"linux": {
10-
"uri": "sbr:8495982523"
10+
"uri": "sbr:8542904242"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8495979560"
13+
"uri": "sbr:8542900801"
1414
},
1515
"win32": {
16-
"uri": "sbr:8495981796"
16+
"uri": "sbr:8542903412"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

+12
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@
532532
"8330113388": "{registry_endpoint}/8330113388",
533533
"8444524403": "{registry_endpoint}/8444524403",
534534
"8533025565": "{registry_endpoint}/8533025565",
535+
"8546855765": "{registry_endpoint}/8546855765",
535536
"5486731632": "{registry_endpoint}/5486731632",
536537
"5514350352": "{registry_endpoint}/5514350352",
537538
"5514360398": "{registry_endpoint}/5514360398",
@@ -747,6 +748,7 @@
747748
"8440741812": "{registry_endpoint}/8440741812",
748749
"8478717011": "{registry_endpoint}/8478717011",
749750
"8495998200": "{registry_endpoint}/8495998200",
751+
"8542905826": "{registry_endpoint}/8542905826",
750752
"5766171800": "{registry_endpoint}/5766171800",
751753
"5805430761": "{registry_endpoint}/5805430761",
752754
"5829025456": "{registry_endpoint}/5829025456",
@@ -825,6 +827,7 @@
825827
"8440740655": "{registry_endpoint}/8440740655",
826828
"8478715857": "{registry_endpoint}/8478715857",
827829
"8495996711": "{registry_endpoint}/8495996711",
830+
"8542904543": "{registry_endpoint}/8542904543",
828831
"5766173070": "{registry_endpoint}/5766173070",
829832
"5805432830": "{registry_endpoint}/5805432830",
830833
"5829031598": "{registry_endpoint}/5829031598",
@@ -903,6 +906,7 @@
903906
"8440743682": "{registry_endpoint}/8440743682",
904907
"8478719343": "{registry_endpoint}/8478719343",
905908
"8496000609": "{registry_endpoint}/8496000609",
909+
"8542907827": "{registry_endpoint}/8542907827",
906910
"5766171341": "{registry_endpoint}/5766171341",
907911
"5805430188": "{registry_endpoint}/5805430188",
908912
"5829023352": "{registry_endpoint}/5829023352",
@@ -981,6 +985,7 @@
981985
"8440739614": "{registry_endpoint}/8440739614",
982986
"8478714843": "{registry_endpoint}/8478714843",
983987
"8495995517": "{registry_endpoint}/8495995517",
988+
"8542903617": "{registry_endpoint}/8542903617",
984989
"8270821739": "{registry_endpoint}/8270821739",
985990
"8295446553": "{registry_endpoint}/8295446553",
986991
"8326170338": "{registry_endpoint}/8326170338",
@@ -989,6 +994,7 @@
989994
"8440742993": "{registry_endpoint}/8440742993",
990995
"8478718322": "{registry_endpoint}/8478718322",
991996
"8495999423": "{registry_endpoint}/8495999423",
997+
"8542906865": "{registry_endpoint}/8542906865",
992998
"5766172695": "{registry_endpoint}/5766172695",
993999
"5805432230": "{registry_endpoint}/5805432230",
9941000
"5829029743": "{registry_endpoint}/5829029743",
@@ -1900,6 +1906,7 @@
19001906
"8330113388": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
19011907
"8444524403": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
19021908
"8533025565": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1909+
"8546855765": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
19031910
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
19041911
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
19051912
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -2115,6 +2122,7 @@
21152122
"8440741812": "devtools/ymake/bin/ymake for darwin",
21162123
"8478717011": "devtools/ymake/bin/ymake for darwin",
21172124
"8495998200": "devtools/ymake/bin/ymake for darwin",
2125+
"8542905826": "devtools/ymake/bin/ymake for darwin",
21182126
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
21192127
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
21202128
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2193,6 +2201,7 @@
21932201
"8440740655": "devtools/ymake/bin/ymake for darwin-arm64",
21942202
"8478715857": "devtools/ymake/bin/ymake for darwin-arm64",
21952203
"8495996711": "devtools/ymake/bin/ymake for darwin-arm64",
2204+
"8542904543": "devtools/ymake/bin/ymake for darwin-arm64",
21962205
"5766173070": "devtools/ymake/bin/ymake for linux",
21972206
"5805432830": "devtools/ymake/bin/ymake for linux",
21982207
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2271,6 +2280,7 @@
22712280
"8440743682": "devtools/ymake/bin/ymake for linux",
22722281
"8478719343": "devtools/ymake/bin/ymake for linux",
22732282
"8496000609": "devtools/ymake/bin/ymake for linux",
2283+
"8542907827": "devtools/ymake/bin/ymake for linux",
22742284
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
22752285
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
22762286
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2349,6 +2359,7 @@
23492359
"8440739614": "devtools/ymake/bin/ymake for linux-aarch64",
23502360
"8478714843": "devtools/ymake/bin/ymake for linux-aarch64",
23512361
"8495995517": "devtools/ymake/bin/ymake for linux-aarch64",
2362+
"8542903617": "devtools/ymake/bin/ymake for linux-aarch64",
23522363
"8270821739": "devtools/ymake/bin/ymake for win32",
23532364
"8295446553": "devtools/ymake/bin/ymake for win32",
23542365
"8326170338": "devtools/ymake/bin/ymake for win32",
@@ -2357,6 +2368,7 @@
23572368
"8440742993": "devtools/ymake/bin/ymake for win32",
23582369
"8478718322": "devtools/ymake/bin/ymake for win32",
23592370
"8495999423": "devtools/ymake/bin/ymake for win32",
2371+
"8542906865": "devtools/ymake/bin/ymake for win32",
23602372
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
23612373
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
23622374
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",

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

+5-5
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:8533025279)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546878689)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533022779)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546877294)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533029812)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546879788)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533020581)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546876196)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533027766)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546879229)
1111

1212
ENDIF()

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

+5-5
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:8533022493)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546854512)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533020676)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546853960)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533025565)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546855765)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533018636)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546853616)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8533023853)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8546854990)
1111

1212
ENDIF()

‎build/plugins/_dart_fields.py

+8
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,14 @@ def value(cls, unit, flat_args, spec_args):
13431343
return {cls.KEY: unit.get("TEST_PARTITION")}
13441344

13451345

1346+
class TestExperimentalFork:
1347+
KEY = 'TEST_EXPERIMENTAL_FORK'
1348+
1349+
@classmethod
1350+
def value(cls, unit, flat_args, spec_args):
1351+
return {cls.KEY: unit.get("TEST_EXPERIMENTAL_FORK")}
1352+
1353+
13461354
class TestRecipes:
13471355
KEY = 'TEST-RECIPES'
13481356

‎build/plugins/ytest.py

+1
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,7 @@ def onadd_pytest_bin(fields, unit, *args):
876876
df.TestEnv.value,
877877
df.TestData.java_test,
878878
df.ForkMode.test_fork_mode,
879+
df.TestExperimentalFork.value,
879880
df.SplitFactor.from_unit,
880881
df.CustomDependencies.test_depends_only,
881882
df.Tag.from_macro_args_and_unit,

‎build/ymake.core.conf

+12
Original file line numberDiff line numberDiff line change
@@ -2762,6 +2762,18 @@ macro FORK_TEST_FILES() {
27622762
SET(FORK_TEST_FILES_MODE on)
27632763
}
27642764

2765+
# tag:test
2766+
TEST_EXPERIMENTAL_FORK=
2767+
### @usage: EXPERIMENTAL_FORK()
2768+
###
2769+
### Only for java-tests: same as FORK_(SUB)TESTS(SEQUENTIAL) for other languages
2770+
### Compatible with FORK_(SUB)TESTS.
2771+
###
2772+
### Documentation about the system test: https://wiki.yandex-team.ru/yatool/test/
2773+
macro EXPERIMENTAL_FORK() {
2774+
SET(TEST_EXPERIMENTAL_FORK yes)
2775+
}
2776+
27652777
# tag:test
27662778
TEST_SIZE_NAME=SMALL
27672779
### @usage: SIZE(SMALL/MEDIUM/LARGE)

‎contrib/libs/fmt/patches/01-clang-tidy-unique-ptr.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- contrib/libs/fmt/include/fmt/args.h (b92e22f2baa7a4b746902dd4641a3025ca1f424f)
2+
+++ contrib/libs/fmt/include/fmt/args.h (working tree)
3+
@@ -51,6 +51,7 @@ class dynamic_arg_list {
4+
5+
public:
6+
template <typename T, typename Arg> const T& push(const Arg& arg) {
7+
+ // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
8+
auto new_node = std::unique_ptr<typed_node<T>>(new typed_node<T>(arg));
9+
auto& value = new_node->value;
10+
new_node->next = std::move(head_);

‎contrib/restricted/boost/iostreams/patches/clang-tidy-unique-ptr.patch

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- contrib/restricted/boost/iostreams/include/boost/iostreams/chain.hpp (b92e22f2baa7a4b746902dd4641a3025ca1f424f)
2+
+++ contrib/restricted/boost/iostreams/include/boost/iostreams/chain.hpp (working tree)
3+
@@ -250,6 +250,7 @@ private:
4+
5+
#else
6+
7+
+ // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
8+
std::unique_ptr<streambuf_t>
9+
buf(new streambuf_t(t, buffer_size, pback_size));
10+

‎contrib/restricted/thrift/patches/uncaught_exception.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- contrib/restricted/thrift/thrift/transport/TFDTransport.cpp (b92e22f2baa7a4b746902dd4641a3025ca1f424f)
2+
+++ contrib/restricted/thrift/thrift/transport/TFDTransport.cpp (working tree)
3+
@@ -46,7 +46,7 @@ void TFDTransport::close() {
4+
int errno_copy = THRIFT_ERRNO;
5+
fd_ = -1;
6+
// Have to check uncaught_exception because this is called in the destructor.
7+
- if (rv < 0 && !std::uncaught_exception()) {
8+
+ if (rv < 0 && !std::uncaught_exceptions()) {
9+
throw TTransportException(TTransportException::UNKNOWN, "TFDTransport::close()", errno_copy);
10+
}
11+
}

‎ya

+10-10
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,33 @@ REGISTRY_ENDPOINT = os.environ.get("YA_REGISTRY_ENDPOINT", "https://devtools-reg
3939
PLATFORM_MAP = {
4040
"data": {
4141
"win32": {
42-
"md5": "3452c1706f37bf62d994367bd7f8aafc",
42+
"md5": "608b241c9a65c68179807b1e5ec1f71e",
4343
"urls": [
44-
f"{REGISTRY_ENDPOINT}/8533019849"
44+
f"{REGISTRY_ENDPOINT}/8546858187"
4545
]
4646
},
4747
"darwin": {
48-
"md5": "36940fce519b798318789559b417f42a",
48+
"md5": "19e94413b5eb46a5d9517125efdeced8",
4949
"urls": [
50-
f"{REGISTRY_ENDPOINT}/8533017016"
50+
f"{REGISTRY_ENDPOINT}/8546857643"
5151
]
5252
},
5353
"darwin-arm64": {
54-
"md5": "bd7edc55492f139ed39555e1a7a56be7",
54+
"md5": "b9b6f539ca6c791d66deec1f0d9bf0c9",
5555
"urls": [
56-
f"{REGISTRY_ENDPOINT}/8533014682"
56+
f"{REGISTRY_ENDPOINT}/8546856435"
5757
]
5858
},
5959
"linux-aarch64": {
60-
"md5": "236ab9d8eb2f2fa3e115ef73af768973",
60+
"md5": "0abf255a8dbd333461c70b6bbd805165",
6161
"urls": [
62-
f"{REGISTRY_ENDPOINT}/8533012028"
62+
f"{REGISTRY_ENDPOINT}/8546855138"
6363
]
6464
},
6565
"linux": {
66-
"md5": "e098353fa2ec7baa39d956e3f1d23c7e",
66+
"md5": "c6e879a4d545de17ba013c247148e64b",
6767
"urls": [
68-
f"{REGISTRY_ENDPOINT}/8533022295"
68+
f"{REGISTRY_ENDPOINT}/8546858664"
6969
]
7070
}
7171
}

‎ydb/ci/rightlib.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6364580e7504b668d60dfb7c720ea27ce3d768e3
1+
7aaaeef499bd938ce3fbc0b622d2a6d27e65520a

0 commit comments

Comments
 (0)