Skip to content

Commit 7882f44

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #12481 from ydb-platform/mergelibs-241210-1802
Library import 241210-1802
2 parents 9e60c00 + 36c79ad commit 7882f44

File tree

216 files changed

+1179
-1381
lines changed

Some content is hidden

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

216 files changed

+1179
-1381
lines changed

‎build/mapping.conf.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,8 @@
458458
"7608382698": "https://devtools-registry.s3.yandex.net/7608382698",
459459
"7621347235": "https://devtools-registry.s3.yandex.net/7621347235",
460460
"7621357676": "https://devtools-registry.s3.yandex.net/7621357676",
461+
"7631718068": "https://devtools-registry.s3.yandex.net/7631718068",
462+
"7631728247": "https://devtools-registry.s3.yandex.net/7631728247",
461463
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
462464
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
463465
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -964,12 +966,15 @@
964966
"7406665335": "https://devtools-registry.s3.yandex.net/7406665335",
965967
"7458630270": "https://devtools-registry.s3.yandex.net/7458630270",
966968
"7193800506": "https://devtools-registry.s3.yandex.net/7193800506",
969+
"7629377653": "https://devtools-registry.s3.yandex.net/7629377653",
967970
"7324461714": "https://devtools-registry.s3.yandex.net/7324461714",
968971
"7193813071": "https://devtools-registry.s3.yandex.net/7193813071",
969972
"7414134699": "https://devtools-registry.s3.yandex.net/7414134699",
970973
"7414121829": "https://devtools-registry.s3.yandex.net/7414121829",
971974
"7442851482": "https://devtools-registry.s3.yandex.net/7442851482",
972975
"7487632536": "https://devtools-registry.s3.yandex.net/7487632536",
976+
"7629350192": "https://devtools-registry.s3.yandex.net/7629350192",
977+
"7629327459": "https://devtools-registry.s3.yandex.net/7629327459",
973978
"3167009386": "https://devtools-registry.s3.yandex.net/3167009386",
974979
"3050798466": "https://devtools-registry.s3.yandex.net/3050798466",
975980
"3064614561": "https://devtools-registry.s3.yandex.net/3064614561",
@@ -1553,6 +1558,8 @@
15531558
"7608382698": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15541559
"7621347235": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15551560
"7621357676": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1561+
"7631718068": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1562+
"7631728247": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15561563
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
15571564
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
15581565
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -2059,12 +2066,15 @@
20592066
"7406665335": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/895e2cbd-d4a8-4a5c-9cf5-5666e796f17a/yfm-docs.tar",
20602067
"7458630270": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/8bb29ea7-2952-4e33-b716-e6d188b5ded9/yfm-docs.tar",
20612068
"7193800506": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/9be8ed55-d7f8-4029-a7fd-fbfa072b896f/yfm-docs.tar",
2069+
"7629377653": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/a7252668-c1a0-49ef-9ec1-cfcd91deac10/yfm-docs.tar",
20622070
"7324461714": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/b3543418-58d4-4e1c-b2be-43b55b035e91/yfm-docs.tar",
20632071
"7193813071": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/b6531a79-b803-4672-a9e9-f9f348009f5f/yfm-docs.tar",
20642072
"7414134699": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/be080cb9-5ea7-467b-80f3-b86165baf8d3/yfm-docs.tar",
20652073
"7414121829": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/c9f3052f-45b4-423b-8d09-fbe676105c06/yfm-docs.tar",
20662074
"7442851482": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/dce499d7-32db-4d37-ae1a-a2704d21e9d8/yfm-docs.tar",
20672075
"7487632536": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/ddd81508-72a7-40c6-837f-cf87839642c8/yfm-docs.tar",
2076+
"7629350192": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/e056c177-de12-4157-8ae6-c9046dd15835/yfm-docs.tar",
2077+
"7629327459": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/ebe6e0d9-5ec1-44a8-af19-327ab4397a82/yfm-docs.tar",
20682078
"3167009386": "openjdk 11.0.15 vanilla for darwin",
20692079
"3050798466": "openjdk 11.0.15 vanilla for darwin-arm64",
20702080
"3064614561": "openjdk 11.0.15 vanilla for linux",

‎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:7621356639)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631715970)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621356288)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631714701)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621357676)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631718068)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621355902)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631713717)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621357026)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631716956)
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:7621346283)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631725491)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621345922)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631724285)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621347235)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631728247)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621345505)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631723135)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7621346894)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7631726652)
1111

1212
ENDIF()

‎build/platform/yfm/ya.make

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ENDIF()
66

77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
88
YFM_TOOL
9-
sbr:7512103615 FOR DARWIN-ARM64
10-
sbr:7512103615 FOR DARWIN
11-
sbr:7512042091 FOR LINUX
12-
sbr:7512107516 FOR WIN32
9+
sbr:7629327459 FOR DARWIN-ARM64
10+
sbr:7629327459 FOR DARWIN
11+
sbr:7629377653 FOR LINUX
12+
sbr:7629350192 FOR WIN32
1313
)
1414

1515
END()

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1+
import hashlib
2+
import json
13
import os
24
import shutil
35

6+
from .constants import PNPM_PRE_LOCKFILE_FILENAME
47
from .lockfile import PnpmLockfile
58
from .utils import build_lockfile_path, build_pre_lockfile_path, build_ws_config_path
69
from .workspace import PnpmWorkspace
710
from ..base import BasePackageManager, PackageManagerError
8-
from ..base.constants import NODE_MODULES_WORKSPACE_BUNDLE_FILENAME, PACKAGE_JSON_FILENAME, PNPM_LOCKFILE_FILENAME
11+
from ..base.constants import (
12+
NODE_MODULES_WORKSPACE_BUNDLE_FILENAME,
13+
PACKAGE_JSON_FILENAME,
14+
PNPM_LOCKFILE_FILENAME,
15+
)
916
from ..base.node_modules_bundler import bundle_node_modules
1017
from ..base.package_json import PackageJson
1118
from ..base.timeit import timeit
@@ -51,6 +58,17 @@ def get_local_pnpm_store():
5158
def get_local_old_pnpm_store():
5259
return os.path.join(home_dir(), ".cache", "pnpm-store")
5360

61+
@timeit
62+
def _get_file_hash(self, path: str):
63+
sha256 = hashlib.sha256()
64+
65+
with open(path, "rb") as f:
66+
# Read the file in chunks
67+
for chunk in iter(lambda: f.read(4096), b""):
68+
sha256.update(chunk)
69+
70+
return sha256.hexdigest()
71+
5472
@timeit
5573
def _create_local_node_modules(self, nm_store_path: str, store_dir: str, virtual_store_dir: str):
5674
"""
@@ -85,6 +103,11 @@ def _create_local_node_modules(self, nm_store_path: str, store_dir: str, virtual
85103

86104
self._run_pnpm_install(store_dir, virtual_store_dir, nm_store_path)
87105

106+
# Write node_modules.json to prevent extra `pnpm install` running 1
107+
with open(os.path.join(nm_store_path, "node_modules.json"), "w") as f:
108+
pre_pnpm_lockfile_hash = self._get_file_hash(build_pre_lockfile_path(self.build_path))
109+
json.dump({PNPM_PRE_LOCKFILE_FILENAME: {"hash": pre_pnpm_lockfile_hash}}, f)
110+
88111
@timeit
89112
def create_node_modules(self, yatool_prebuilder_path=None, local_cli=False, bundle=True):
90113
"""

‎build/plugins/nots.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,10 @@ def _setup_eslint(unit: NotsUnitType) -> None:
593593

594594
extra_deps = df.CustomDependencies.test_depends_only(unit, (), {})[df.CustomDependencies.KEY].split()
595595
dart_record[df.CustomDependencies.KEY] = " ".join(sort_uniq(deps + extra_deps))
596-
dart_record[df.LintFileProcessingTime.KEY] = str(ESLINT_FILE_PROCESSING_TIME_DEFAULT)
596+
597+
if unit.get("TS_LOCAL_CLI") != "yes":
598+
# disable chunks for `ya tool nots`
599+
dart_record[df.LintFileProcessingTime.KEY] = str(ESLINT_FILE_PROCESSING_TIME_DEFAULT)
597600

598601
data = ytest.dump_test(unit, dart_record)
599602
if data:

‎build/sysincl/nvidia.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@
4242
- cusparse.h
4343
- cusparseLt.h
4444
- device_atomic_functions.h
45+
- device_launch_parameters.h
4546
- device_types.h
4647
- driver_types.h
4748
- host_defines.h
4849
- library_types.h
4950
- math_constants.h
5051
- mma.h
5152
- npp.h
53+
- nppdefs.h
5254
- nppi.h
5355
- nv/target
5456
- nvToolsExt.h

‎build/ymake.core.conf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4084,19 +4084,10 @@ _SEM_EXTRA_CXX_FLAGS=
40844084
### @usage: NO_COMPILER_WARNINGS()
40854085
### Disable all compiler warnings in the module.
40864086
macro NO_COMPILER_WARNINGS() {
4087-
.ALLOWED_IN_COMMON=yes
40884087
ENABLE(NO_COMPILER_WARNINGS)
40894088
SET(_SEM_EXTRA_CXX_FLAGS "$<IF:$<CXX_COMPILER_ID:MSVC>,,-Wno-everything>")
40904089
}
40914090

4092-
### @usage: WERROR()
4093-
### Consider warnings as errors in the current module.
4094-
### In the bright future will be removed, since WERROR is the default.
4095-
### DEPRECATED: intentionally does nothing
4096-
macro WERROR() {
4097-
ENABLE(WERROR)
4098-
}
4099-
41004091
### @usage: NO_WERROR()
41014092
### Override WERROR() behavior
41024093
### DEPRECATED: Should be replaced with NO_COMPILER_WARNINGS

‎library/cpp/string_utils/csv/csv.cpp

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ TStringBuf NCsvFormat::CsvSplitter::Consume() {
44
if (Begin == End) {
55
return nullptr;
66
}
7-
TString::iterator TokenStart = Begin;
8-
TString::iterator TokenEnd = Begin;
7+
TString::const_iterator TokenStart = Begin;
8+
TString::const_iterator TokenEnd = Begin;
99
if (Quote == '\0') {
1010
while (1) {
1111
if (TokenEnd == End || *TokenEnd == Delimeter) {
@@ -33,21 +33,29 @@ TStringBuf NCsvFormat::CsvSplitter::Consume() {
3333
} else if (*(TokenEnd + 1) == Delimeter) {
3434
Begin = TokenEnd + 1;
3535
} else if (*(TokenEnd + 1) == Quote) {
36-
CustomStringBufs.push_back(TStringBuf(TokenStart, (TokenEnd + 1)));
36+
TempResultParts.push_back(TStringBuf(TokenStart, (TokenEnd + 1)));
3737
TokenEnd += 2;
3838
TokenStart = TokenEnd;
3939
continue;
4040
} else {
4141
Y_ENSURE(false, TStringBuf("RFC4180 violation: in escaped string quotation mark must be followed by a delimiter, EOL or another quotation mark"));
4242
}
43-
if (CustomStringBufs.size()) {
44-
CustomString.clear();
45-
for (auto CustomStringBuf : CustomStringBufs) {
46-
CustomString += TString{ CustomStringBuf };
43+
if (TempResultParts.size()) {
44+
auto newEscapedStringPtr = std::make_unique<TString>();
45+
size_t newStringSize = 0;
46+
for (auto tempResultPart : TempResultParts) {
47+
newStringSize += tempResultPart.size();
4748
}
48-
CustomString += TString{ TStringBuf(TokenStart, TokenEnd) };
49-
CustomStringBufs.clear();
50-
return TStringBuf(CustomString);
49+
newStringSize += TokenEnd - TokenStart;
50+
newEscapedStringPtr->reserve(newStringSize);
51+
for (auto tempResultPart : TempResultParts) {
52+
*newEscapedStringPtr += TString{ tempResultPart };
53+
}
54+
*newEscapedStringPtr += TString{ TStringBuf(TokenStart, TokenEnd) };
55+
TempResultParts.clear();
56+
// Storing built string so that returned TStringBuf won't change until this splitter is destroyed
57+
TempResults.push_back(std::move(newEscapedStringPtr));
58+
return TStringBuf(*TempResults.back());
5159
} else {
5260
return TStringBuf(TokenStart, TokenEnd);
5361
}

‎library/cpp/string_utils/csv/csv.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include <util/generic/vector.h>
66
#include <util/stream/input.h>
77

8+
#include <vector>
9+
810
/*
911
Split string by rfc4180
1012
*/
@@ -24,7 +26,7 @@ namespace NCsvFormat {
2426

2527
class CsvSplitter {
2628
public:
27-
CsvSplitter(TString& data, const char delimeter = ',', const char quote = '"')
29+
CsvSplitter(const TString& data, const char delimeter = ',', const char quote = '"')
2830
// quote = '\0' ignores quoting in values and words like simple split
2931
: Delimeter(delimeter)
3032
, Quote(quote)
@@ -56,9 +58,9 @@ namespace NCsvFormat {
5658
private:
5759
const char Delimeter;
5860
const char Quote;
59-
TString::iterator Begin;
61+
TString::const_iterator Begin;
6062
const TString::const_iterator End;
61-
TString CustomString;
62-
TVector<TStringBuf> CustomStringBufs;
63+
std::vector<std::unique_ptr<TString>> TempResults; // CsvSplitter lifetime
64+
std::vector<TStringBuf> TempResultParts; // Single Consume() method call lifetime
6365
};
6466
}

0 commit comments

Comments
 (0)