Skip to content

Commit 14c83d5

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #12761 from ydb-platform/mergelibs-241219-0815
Library import 241219-0815
2 parents 2660174 + 9f1289a commit 14c83d5

File tree

1,294 files changed

+180564
-95522
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,294 files changed

+180564
-95522
lines changed

‎build/conf/java.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ LINK_JAR_PROGRAM=${hide:JAVA_FAKEID} $FS_TOOLS md ${BINDIR}/${REALPRJNAME} \
12431243
LINK_UBERJAR_PROGRAM=${hide:JAVA_FAKEID} ${hide;kv:"p UJ"} ${MAKE_JAVA_CLASSPATH_FILE} --from-args ${output;pre=$MODULE_PREFIX;suf=${MODULE_SUFFIX}.cplst:REALPRJNAME} $TARGET \
12441244
&& $FS_TOOLS md ${BINDIR}/${REALPRJNAME} \
12451245
&& $FS_TOOLS link_or_copy ${BINDIR}/${REALPRJNAME}.jar $TARGET \
1246-
&& $FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${BINDIR}/${REALPRJNAME}.jar ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;output;ext=.jar;pre=$BINDIR/$REALPRJNAME/:REALPRJNAME} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.so:MANAGED_PEERS_CLOSURE} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dll:MANAGED_PEERS_CLOSURE} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dylib:MANAGED_PEERS_CLOSURE} \
1246+
&& $FS_TOOLS link_or_copy_to_dir --ya-start-command-file ${BINDIR}/${REALPRJNAME}.jar ${ext=.so:MANAGED_PEERS_CLOSURE} ${ext=.dll:MANAGED_PEERS_CLOSURE} ${ext=.dylib:MANAGED_PEERS_CLOSURE} ${_SOURCE_JARS} --ya-end-command-file ${BINDIR}/${REALPRJNAME} ${hide;output;suf=.jar;pre=$REALPRJNAME/:REALPRJNAME} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.so:MANAGED_PEERS_CLOSURE} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dll:MANAGED_PEERS_CLOSURE} ${hide;late_out;pre=$BINDIR/$REALPRJNAME/;nopath;ext=.dylib:MANAGED_PEERS_CLOSURE} \
12471247
&& $DO_TAR_CLASSPATH \
12481248
&& $_GEN_USERSCRIPTS \
12491249
&& $_PACK_JDK

‎build/export_generators/ide-gradle/preview.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ tasks.withType<JavaCompile> {
77
}
88

99
tasks.withType<JavaExec> {
10-
jvmArgs?.add("--enable-preview")
10+
jvmArgs = mutableListOf("--enable-preview")
1111
}
1212

1313
tasks.withType<Test> {
14-
jvmArgs?.add("--enable-preview")
14+
jvmArgs = mutableListOf("--enable-preview")
1515
environment["JAVA_TOOL_OPTIONS"] = "--enable-preview"
1616
}
1717

‎build/mapping.conf.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,8 @@
462462
"7631728247": "https://devtools-registry.s3.yandex.net/7631728247",
463463
"7658393380": "https://devtools-registry.s3.yandex.net/7658393380",
464464
"7658438634": "https://devtools-registry.s3.yandex.net/7658438634",
465+
"7688925574": "https://devtools-registry.s3.yandex.net/7688925574",
466+
"7688984774": "https://devtools-registry.s3.yandex.net/7688984774",
465467
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
466468
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
467469
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1125,6 +1127,7 @@
11251127
"7663137240": "https://devtools-registry.s3.yandex.net/7663137240",
11261128
"7495957585": "https://devtools-registry.s3.yandex.net/7495957585",
11271129
"6048579718": "https://devtools-registry.s3.yandex.net/6048579718",
1130+
"7686710688": "https://devtools-registry.s3.yandex.net/7686710688",
11281131
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
11291132
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408",
11301133
"7663495611": "https://devtools-registry.s3.yandex.net/7663495611"
@@ -1591,6 +1594,8 @@
15911594
"7631728247": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15921595
"7658393380": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15931596
"7658438634": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1597+
"7688925574": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1598+
"7688984774": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15941599
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
15951600
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
15961601
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -2254,6 +2259,7 @@
22542259
"7663137240": "ynd-clang-format-18-mingw-w64-x86_64-809bd279d61c38bc40e133d3013ac46e8c4049b7",
22552260
"7495957585": "ynd-clang-format-18-mingw-w64-x86_64-d0b9255e235e80974f9dfd0ebff3850929bed981",
22562261
"6048579718": "yt/go/ytrecipe/cmd/ytexec for linux",
2262+
"7686710688": "yt/go/ytrecipe/cmd/ytexec for linux",
22572263
"2980468199": "ytexec for linux",
22582264
"5562224408": "ytexec for linux",
22592265
"7663495611": "ytexec for linux"

‎build/platform/java/jdk/jdk23/jdk.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"by_platform": {
3+
"darwin-arm64": {
4+
"uri": "sbr:7552080809"
5+
},
6+
"darwin-x86_64": {
7+
"uri": "sbr:7552077729"
8+
},
9+
"linux-x86_64": {
10+
"uri": "sbr:7552070388"
11+
},
12+
"linux-aarch64": {
13+
"uri": "sbr:7552072726"
14+
},
15+
"win32-x86_64": {
16+
"uri": "sbr:7552075245"
17+
}
18+
}
19+
}

‎build/platform/java/jdk/jdk23/ya.make

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
RESOURCES_LIBRARY()
2+
3+
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(JDK23 jdk.json)
4+
SET_RESOURCE_URI_FROM_JSON(WITH_JDK23_URI jdk.json)
5+
6+
IF (WITH_JDK23_URI)
7+
DECLARE_EXTERNAL_RESOURCE(WITH_JDK23 ${WITH_JDK23_URI})
8+
ENDIF()
9+
10+
END()
11+
12+
IF (AUTOCHECK)
13+
RECURSE_FOR_TESTS(ut)
14+
ENDIF()
15+
IF(YA_IDE_IDEA)
16+
RECURSE_FOR_TESTS(ut)
17+
ENDIF()

‎build/platform/java/jdk/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RECURSE(
3737
jdk20
3838
jdk21
3939
jdk22
40+
jdk23
4041
testing
4142
)
4243

‎build/platform/linux_sdk/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ ELSEIF (ARCH_AARCH64)
2929
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:309054781)
3030
ELSEIF (OS_SDK == "ubuntu-20")
3131
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:6601145959)
32+
ELSEIF (OS_SDK == "ubuntu-22")
33+
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:7693283407)
3234
ELSE()
3335
MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for AArch64/ARMv8 64 bit")
3436
ENDIF()

‎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:7658436923)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688980745)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658436110)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688979180)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658438634)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688984774)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658435304)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688977846)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658437694)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688983202)
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:7658391057)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688921363)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658389921)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688919549)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658393380)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688925574)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658388690)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688917384)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7658392345)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7688923417)
1111

1212
ENDIF()

‎contrib/libs/apache/arrow/patches/fix-ARROW-15511.patch

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
From 3f9daeb25fd471e85d584a2743f83a1abfe5fb3d Mon Sep 17 00:00:00 2001
2+
From: emkornfield <emkornfield@gmail.com>
3+
Date: Wed, 2 Feb 2022 12:26:12 +0100
4+
Subject: [PATCH] ARROW-15511: [Python][C++] Remove reference management in
5+
numpy indexer
6+
7+
It appears all usages don't escape the scope of methods so a strong reference should already be in place.
8+
This is necessary because Ndarray1DIndexer can be used without the GIL held.
9+
10+
Closes #12314 from emkornfield/ARROW-15511
11+
12+
Authored-by: emkornfield <emkornfield@gmail.com>
13+
Signed-off-by: Antoine Pitrou <antoine@python.org>
14+
---
15+
cpp/src/arrow/python/numpy_internal.h | 3 +--
16+
1 file changed, 1 insertion(+), 2 deletions(-)
17+
18+
diff --git a/cpp/src/arrow/python/numpy_internal.h b/cpp/src/arrow/python/numpy_internal.h
19+
index 973f577cb1320..50d1a0fcb75d4 100644
120
--- a/cpp/src/arrow/python/numpy_internal.h
221
+++ b/cpp/src/arrow/python/numpy_internal.h
322
@@ -43,12 +43,11 @@ class Ndarray1DIndexer {

0 commit comments

Comments
 (0)