Skip to content

Commit 7874efe

Browse files
ydbotydbot
committed
Merge pull request #26940 from ydb-platform/merge-rightlib-251016-0050
2 parents b0dc87f + 14e27f7 commit 7874efe

File tree

107 files changed

+3197
-1254
lines changed

Some content is hidden

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

107 files changed

+3197
-1254
lines changed

‎build/conf/settings.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SAVELOAD_GLOB_PATTERNS=yes
1717
SAVELOAD_GLOB_STAT=yes
1818
UPDATE_GLOB_STAT=yes
1919
SAVE_GLOB_RESTRICTIONS=yes
20-
CHECK_GLOB_RESTRICTIONS=no
20+
CHECK_GLOB_RESTRICTIONS=yes
2121
MODULES_WITH_EXTENDED_GLOB_RESTRICTIONS=adv/frontend/packages/direct-modules adv/frontend/services/adfox/docs adv/frontend/services/yharnam classifieds/autoru-frontend classifieds/internal-frontend classifieds/realty-frontend cloud/docs/internal-doc-config docs/yateam/diy/external docs/yateam/diy/internal/outstaff docs/yateam/diy/internal/yandex fintech/backend-kotlin/services/mobile-views/src/test sdg/hw/embedded/pytools/ci/check_settings taxi/jotunn docs/support/marketplace docs/support/marketplace/cross-border logos/logs/md_schema docs/selfhost/alice-common/alice alice/quark/docs
2222

2323
# Percent of skipped files in glob with >=500 files for generate configure error (0 - don't check skipped files count)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@ plugins {
4343
{%- if jdk_version %}
4444

4545
java {
46+
{%- if jdk11_compatibility_mode and proto_template %}
47+
toolchain {
48+
languageVersion = JavaLanguageVersion.of("11")
49+
}
50+
{%- else %}
4651
toolchain {
4752
languageVersion = JavaLanguageVersion.of("{{ jdk_version }}")
4853
}
54+
{%- endif %}
4955
}
5056
{% endif -%}

‎build/mapping.conf.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,32 @@
6666
"545709491": "{registry_endpoint}/545709491",
6767
"8819738409": "{registry_endpoint}/8819738409",
6868
"8819741054": "{registry_endpoint}/8819741054",
69+
"9961792860": "{registry_endpoint}/9961792860",
70+
"9961802705": "{registry_endpoint}/9961802705",
6971
"8819739625": "{registry_endpoint}/8819739625",
7072
"8819739158": "{registry_endpoint}/8819739158",
73+
"9931192764": "{registry_endpoint}/9931192764",
74+
"9931194789": "{registry_endpoint}/9931194789",
7175
"8819739125": "{registry_endpoint}/8819739125",
7276
"8819738259": "{registry_endpoint}/8819738259",
77+
"9931194321": "{registry_endpoint}/9931194321",
78+
"9931194827": "{registry_endpoint}/9931194827",
7379
"8819739285": "{registry_endpoint}/8819739285",
7480
"8819745302": "{registry_endpoint}/8819745302",
81+
"9961767353": "{registry_endpoint}/9961767353",
82+
"9961780766": "{registry_endpoint}/9961780766",
7583
"8819742469": "{registry_endpoint}/8819742469",
7684
"8819740595": "{registry_endpoint}/8819740595",
85+
"9931194914": "{registry_endpoint}/9931194914",
86+
"9931193485": "{registry_endpoint}/9931193485",
7787
"8819739569": "{registry_endpoint}/8819739569",
7888
"8819739453": "{registry_endpoint}/8819739453",
89+
"9931194425": "{registry_endpoint}/9931194425",
90+
"9931194328": "{registry_endpoint}/9931194328",
7991
"9303012921": "{registry_endpoint}/9303012921",
8092
"9303013124": "{registry_endpoint}/9303013124",
93+
"9931195077": "{registry_endpoint}/9931195077",
94+
"9931193236": "{registry_endpoint}/9931193236",
8195
"6638626363": "{registry_endpoint}/6638626363",
8296
"6638629972": "{registry_endpoint}/6638629972",
8397
"7245028676": "{registry_endpoint}/7245028676",
@@ -646,6 +660,7 @@
646660
"9943449381": "{registry_endpoint}/9943449381",
647661
"9954964563": "{registry_endpoint}/9954964563",
648662
"9974358003": "{registry_endpoint}/9974358003",
663+
"9985353571": "{registry_endpoint}/9985353571",
649664
"5486731632": "{registry_endpoint}/5486731632",
650665
"5514350352": "{registry_endpoint}/5514350352",
651666
"5514360398": "{registry_endpoint}/5514360398",
@@ -1682,6 +1697,11 @@
16821697
"8563465815": "{registry_endpoint}/8563465815",
16831698
"7599422144": "{registry_endpoint}/7599422144",
16841699
"7451406900": "{registry_endpoint}/7451406900",
1700+
"9996985259": "{registry_endpoint}/9996985259",
1701+
"9997020231": "{registry_endpoint}/9997020231",
1702+
"9997040715": "{registry_endpoint}/9997040715",
1703+
"9997099093": "{registry_endpoint}/9997099093",
1704+
"9997141431": "{registry_endpoint}/9997141431",
16851705
"9312445290": "{registry_endpoint}/9312445290",
16861706
"9313113890": "{registry_endpoint}/9313113890",
16871707
"9312687843": "{registry_endpoint}/9312687843",
@@ -1817,18 +1837,32 @@
18171837
"545709491": "JAVA_LIBRARY-none-none-javax.annotation-api-1.3.1.jar",
18181838
"8819738409": "JAVA_LIBRARY-none-none-junit-jupiter-5.12.2-sources.jar",
18191839
"8819741054": "JAVA_LIBRARY-none-none-junit-jupiter-5.12.2.jar",
1840+
"9961792860": "JAVA_LIBRARY-none-none-junit-jupiter-5.13.4-sources.jar",
1841+
"9961802705": "JAVA_LIBRARY-none-none-junit-jupiter-5.13.4.jar",
18201842
"8819739625": "JAVA_LIBRARY-none-none-junit-jupiter-api-5.12.2-sources.jar",
18211843
"8819739158": "JAVA_LIBRARY-none-none-junit-jupiter-api-5.12.2.jar",
1844+
"9931192764": "JAVA_LIBRARY-none-none-junit-jupiter-api-5.13.4-sources.jar",
1845+
"9931194789": "JAVA_LIBRARY-none-none-junit-jupiter-api-5.13.4.jar",
18221846
"8819739125": "JAVA_LIBRARY-none-none-junit-jupiter-engine-5.12.2-sources.jar",
18231847
"8819738259": "JAVA_LIBRARY-none-none-junit-jupiter-engine-5.12.2.jar",
1848+
"9931194321": "JAVA_LIBRARY-none-none-junit-jupiter-engine-5.13.4-sources.jar",
1849+
"9931194827": "JAVA_LIBRARY-none-none-junit-jupiter-engine-5.13.4.jar",
18241850
"8819739285": "JAVA_LIBRARY-none-none-junit-jupiter-params-5.12.2-sources.jar",
18251851
"8819745302": "JAVA_LIBRARY-none-none-junit-jupiter-params-5.12.2.jar",
1852+
"9961767353": "JAVA_LIBRARY-none-none-junit-jupiter-params-5.13.4-sources.jar",
1853+
"9961780766": "JAVA_LIBRARY-none-none-junit-jupiter-params-5.13.4.jar",
18261854
"8819742469": "JAVA_LIBRARY-none-none-junit-platform-commons-1.12.2-sources.jar",
18271855
"8819740595": "JAVA_LIBRARY-none-none-junit-platform-commons-1.12.2.jar",
1856+
"9931194914": "JAVA_LIBRARY-none-none-junit-platform-commons-1.13.4-sources.jar",
1857+
"9931193485": "JAVA_LIBRARY-none-none-junit-platform-commons-1.13.4.jar",
18281858
"8819739569": "JAVA_LIBRARY-none-none-junit-platform-engine-1.12.2-sources.jar",
18291859
"8819739453": "JAVA_LIBRARY-none-none-junit-platform-engine-1.12.2.jar",
1860+
"9931194425": "JAVA_LIBRARY-none-none-junit-platform-engine-1.13.4-sources.jar",
1861+
"9931194328": "JAVA_LIBRARY-none-none-junit-platform-engine-1.13.4.jar",
18301862
"9303012921": "JAVA_LIBRARY-none-none-junit-platform-launcher-1.12.2-sources.jar",
18311863
"9303013124": "JAVA_LIBRARY-none-none-junit-platform-launcher-1.12.2.jar",
1864+
"9931195077": "JAVA_LIBRARY-none-none-junit-platform-launcher-1.13.4-sources.jar",
1865+
"9931193236": "JAVA_LIBRARY-none-none-junit-platform-launcher-1.13.4.jar",
18321866
"6638626363": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24-sources.jar",
18331867
"6638629972": "JAVA_LIBRARY-none-none-kotlin-stdlib-1.9.24.jar",
18341868
"7245028676": "JAVA_LIBRARY-none-none-kotlin-stdlib-2.0.21-sources.jar",
@@ -2397,6 +2431,7 @@
23972431
"9943449381": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23982432
"9954964563": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
23992433
"9974358003": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
2434+
"9985353571": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
24002435
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
24012436
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
24022437
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -3433,6 +3468,11 @@
34333468
"8563465815": "ynd-clang-18-optimized-mingw-w64-x86_64-b96bb13a4532bc0f19859cd0fd8590f36e4ac9f4",
34343469
"7599422144": "ynd-clang-18-optimized-mingw-w64-x86_64-c40775195488adad9218aa6c6dcaf4c20dca0084",
34353470
"7451406900": "ynd-clang-18-optimized-mingw-w64-x86_64-c66062833fd14752a7ad8fbfb8f25f370b097278",
3471+
"9996985259": "ynd-clang-20-d-darwin-arm64-aac4180455b0ebf0dd78a66d1fca7e84d0dedf13",
3472+
"9997020231": "ynd-clang-20-d-darwin-x86_64-aac4180455b0ebf0dd78a66d1fca7e84d0dedf13",
3473+
"9997040715": "ynd-clang-20-d-linux-aarch64-aac4180455b0ebf0dd78a66d1fca7e84d0dedf13",
3474+
"9997099093": "ynd-clang-20-d-linux-x86_64-aac4180455b0ebf0dd78a66d1fca7e84d0dedf13",
3475+
"9997141431": "ynd-clang-20-d-mingw-w64-x86_64-aac4180455b0ebf0dd78a66d1fca7e84d0dedf13",
34363476
"9312445290": "ynd-clang-20-darwin-arm64-60b11ab3ce06554c1763fe1e2a84915201e6e6dd",
34373477
"9313113890": "ynd-clang-20-darwin-x86_64-60b11ab3ce06554c1763fe1e2a84915201e6e6dd",
34383478
"9312687843": "ynd-clang-20-linux-aarch64-60b11ab3ce06554c1763fe1e2a84915201e6e6dd",

‎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:9974374623)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985369410)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974373061)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985365495)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974376654)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985375160)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974372010)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985362301)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974375687)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985372335)
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:9974356779)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985347260)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974355723)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985344210)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974358003)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985353571)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974355330)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985341289)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9974357371)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:9985350661)
1111

1212
ENDIF()

‎build/platform/yfm/resources.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"by_platform": {
33
"win32-x86_64": {
4-
"uri": "sbr:9915061557"
4+
"uri": "sbr:10002275143"
55
},
66
"darwin-x86_64": {
7-
"uri": "sbr:9915059253"
7+
"uri": "sbr:10002271803"
88
},
99
"linux-x86_64": {
10-
"uri": "sbr:9915056735"
10+
"uri": "sbr:10002267698"
1111
},
1212
"darwin-arm64": {
13-
"uri": "sbr:9915059253"
13+
"uri": "sbr:10002271803"
1414
}
1515
}
1616
}

‎build/plugins/lib/nots/package_manager/base/utils.py‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,35 @@ def build_nm_bundle_path(p):
5050
return os.path.join(p, NODE_MODULES_WORKSPACE_BUNDLE_FILENAME)
5151

5252

53-
def init_nots_path(build_root: str, local_cli: bool):
54-
base_dir = home_dir() if local_cli else build_root
55-
os.environ.setdefault("NOTS_STORE_PATH", os.path.join(base_dir, ".nots"))
53+
def build_nots_path(build_root: str) -> str:
54+
home_nots = os.getenv("NOTS_STORE_PATH", os.path.join(home_dir(), ".nots"))
55+
build_nots = os.path.join(build_root, ".nots")
56+
57+
try:
58+
if not os.path.exists(home_nots):
59+
os.makedirs(home_nots)
60+
if not os.path.exists(build_nots):
61+
os.symlink(home_nots, build_nots)
62+
except (OSError, RuntimeError):
63+
os.makedirs(build_nots, exist_ok=True)
64+
65+
return build_nots
5666

5767

58-
def build_nots_path() -> str:
59-
return os.getenv("NOTS_STORE_PATH")
68+
def build_nm_store_path(build_root: str, moddir: str) -> str:
69+
return os.path.join(build_nots_path(build_root), "nm_store", moddir)
6070

6171

62-
def build_nm_store_path(moddir: str) -> str:
63-
return os.path.join(build_nots_path(), "nm_store", moddir)
72+
def build_vs_store_path(build_root: str, moddir: str) -> str:
73+
return os.path.join(build_nots_path(build_root), "vm_store", moddir)
6474

6575

66-
def build_vs_store_path(moddir: str) -> str:
67-
return os.path.join(build_nots_path(), "vm_store", moddir)
76+
def build_traces_store_path(build_root: str, moddir: str) -> str:
77+
return os.path.join(build_nots_path(build_root), "traces", moddir)
6878

6979

70-
def build_traces_store_path(moddir: str) -> str:
71-
return os.path.join(build_nots_path(), "traces", moddir)
80+
def build_pnpm_store_path(build_root: str) -> str:
81+
return os.path.join(build_nots_path(build_root), "pnpm_store")
7282

7383

7484
def extract_package_name_from_path(p):

‎build/plugins/lib/nots/package_manager/pnpm/pnpm_package_manager.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
build_build_backup_lockfile_path,
1414
build_pre_lockfile_path,
1515
build_ws_config_path,
16-
build_pnpm_store_path,
1716
)
1817
from .pnpm_workspace import PnpmWorkspace
1918
from ..base import BasePackageManager, PackageManagerError
@@ -26,7 +25,7 @@
2625
build_nm_path,
2726
build_nm_store_path,
2827
build_pj_path,
29-
init_nots_path,
28+
build_pnpm_store_path,
3029
s_rooted,
3130
)
3231

@@ -154,9 +153,9 @@ def load_lockfile_from_dir(cls, dir_path):
154153
"""
155154
return cls.load_lockfile(build_lockfile_path(dir_path))
156155

157-
@staticmethod
158-
def get_pnpm_store():
159-
return build_pnpm_store_path()
156+
@timeit
157+
def _get_pnpm_store(self):
158+
return build_pnpm_store_path(self.build_root)
160159

161160
@timeit
162161
def _get_file_hash(self, path: str):
@@ -174,14 +173,12 @@ def create_node_modules(self, yatool_prebuilder_path=None, local_cli=False, nm_b
174173
"""
175174
Creates node_modules directory according to the lockfile.
176175
"""
177-
init_nots_path(self.build_root, local_cli)
178-
179176
ws = self._prepare_workspace(local_cli)
180177

181178
self._copy_pnpm_patches()
182179

183180
# Pure `tier 0` logic - isolated stores in the `build_root` (works in `distbuild` and `CI autocheck`)
184-
store_dir = self.get_pnpm_store()
181+
store_dir = self._get_pnpm_store()
185182
virtual_store_dir = self._nm_path(VIRTUAL_STORE_DIRNAME)
186183

187184
self._run_pnpm_install(store_dir, virtual_store_dir, self.build_path, local_cli)
@@ -242,8 +239,12 @@ def execute_install_cmd():
242239
if local_cli:
243240
files_to_hash = [build_pre_lockfile_path(self.build_path)]
244241
paths_to_exist = [build_nm_path(cwd)]
245-
hash_file = os.path.join(build_nm_store_path(self.module_path), LOCAL_PNPM_INSTALL_HASH_FILENAME)
246-
mutex_file = os.path.join(build_nm_store_path(self.module_path), LOCAL_PNPM_INSTALL_MUTEX_FILENAME)
242+
hash_file = os.path.join(
243+
build_nm_store_path(self.build_root, self.module_path), LOCAL_PNPM_INSTALL_HASH_FILENAME
244+
)
245+
mutex_file = os.path.join(
246+
build_nm_store_path(self.build_root, self.module_path), LOCAL_PNPM_INSTALL_MUTEX_FILENAME
247+
)
247248
os.makedirs(os.path.dirname(mutex_file), exist_ok=True)
248249
execute_cmd_hashed = hashed_by_files(files_to_hash, paths_to_exist, hash_file)(execute_install_cmd)
249250
execute_hashed_cmd_exclusively = sync_mutex_file(mutex_file)(execute_cmd_hashed)

‎build/plugins/lib/nots/package_manager/pnpm/utils.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import os
22

3-
from ..base.utils import home_dir
43
from .constants import (
54
PNPM_BUILD_BACKUP_LOCKFILE_FILENAME,
65
PNPM_PRE_LOCKFILE_FILENAME,
76
PNPM_LOCKFILE_FILENAME,
87
PNPM_WS_FILENAME,
9-
STORE_DIRNAME,
108
)
119

1210

@@ -24,7 +22,3 @@ def build_lockfile_path(p):
2422

2523
def build_ws_config_path(p):
2624
return os.path.join(p, PNPM_WS_FILENAME)
27-
28-
29-
def build_pnpm_store_path() -> str:
30-
return os.path.join(os.getenv("NOTS_STORE_PATH", os.path.join(home_dir(), ".nots")), STORE_DIRNAME)

0 commit comments

Comments
 (0)