Skip to content

Commit 814a275

Browse files
GrigoriyPAGrigoriyPA
authored
Merge branch 'ydb-platform:main' into main
2 parents 38f7f13 + ad9e0e0 commit 814a275

File tree

176 files changed

+3366
-1757
lines changed

Some content is hidden

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

176 files changed

+3366
-1757
lines changed

‎.github/workflows/prewarm-debug.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
build_preset: ["relwithdebinfo", "release-asan", "debug"]
11+
build_preset: ["release", "relwithdebinfo", "release-asan", "debug"]
1212
runs-on: [ self-hosted, auto-provisioned, "${{ format('build-preset-{0}', matrix.build_preset) }}" ]
1313
name: Build and test ${{ matrix.build_preset }}
1414
steps:

‎.github/workflows/regression_whitelist_run.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
- build_preset: relwithdebinfo
2020
threads_count: 52
2121
timeout: 300
22-
build_target: "ydb/tests/sql/ ydb/tests/stress"
22+
build_target: "ydb/tests/sql/ ydb/tests/stress ydb/tests/functional/tpc ydb/tests/functional/benchmarks_init"
2323
test_size: small,medium,large
2424
test_type: unittest,py3test,py2test,pytest
2525
- build_preset: release-asan
2626
threads_count: 20
2727
timeout: 480
28-
build_target: "ydb/tests/sql/ ydb/tests/stress"
28+
build_target: "ydb/tests/sql/ ydb/tests/stress ydb/tests/functional/tpc ydb/tests/functional/benchmarks_init"
2929
test_size: small,medium,large
3030
test_type: unittest,py3test,py2test,pytest
3131
- build_preset: release-msan
@@ -37,7 +37,7 @@ jobs:
3737
- build_preset: release-tsan
3838
threads_count: 10
3939
timeout: 600
40-
build_target: "ydb/tests/sql/ ydb/tests/stress"
40+
build_target: "ydb/tests/sql/ ydb/tests/stress ydb/tests/functional/tpc ydb/tests/functional/benchmarks_init"
4141
test_size: small,medium
4242
test_type: unittest,py3test,py2test,pytest
4343

‎build/conf/opensource_export.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
when ($OPENSOURCE_PROJECT != "") {
22
select ($OPENSOURCE_PROJECT) {
33
"catboost" ? {
4-
OPENSOURCE_REPLACE_OPENSSL="1.1.1t"
4+
OPENSOURCE_REPLACE_OPENSSL="3.0.15"
55
}
66
"yt" ? {
77
OPENSOURCE_REPLACE_LINUX_HEADERS="6.5.9"

‎build/conf/python.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ macro PYTHON3_ADDINCL() {
897897
macro _ARCADIA_PYTHON3_ADDINCL() {
898898
_PYTHON3_ADDINCL()
899899
SET(MODULE_TAG PY3)
900-
SET(PEERDIR_TAGS PY3 PY3_BIN_LIB PY3TEST_LIBRARY PY3_NATIVE PY3_PROTO PY3_PROTO_FROM_SCHEMA PY3_FBS PY3_ROS YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB)
900+
SET(PEERDIR_TAGS PY3 PY3_BIN_LIB PY3TEST_LIBRARY PY3_NATIVE PY3_PROTO PY3_PROTO_FROM_SCHEMA PY3_FBS PY3_ROS YQL_UDF_STATIC __EMPTY__ RESOURCE_LIB DLL_LIB ALICE_NLG_LIB)
901901
}
902902

903903
# tag:python-specific tag:internal

‎build/config/tests/cpp_style/a.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ arcanum:
88
- name: cppcommittee
99
roles: cppcommittee:consultant
1010
rules:
11-
- subpaths: "config.clang-format"
11+
- subpaths: ".clang-format"
1212
reviewers:
1313
- name: cppcommittee
1414
assign: 1

‎build/config/tests/cpp_style/config.clang-format

-97
This file was deleted.

‎build/config/tests/cpp_style/ya.make

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ LIBRARY()
22

33
RESOURCE_FILES(
44
.clang-format
5-
config.clang-format
65
)
76

87
END()

‎build/config/tests/py_style/config.toml

-3
This file was deleted.

‎build/config/tests/py_style/ya.make

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
LIBRARY()
22

33
RESOURCE_FILES(
4-
config.toml
54
pyproject.toml
65
)
76

‎build/plugins/_dart_fields.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ def cpp_configs(cls, unit, flat_args, spec_args):
670670
class LintExtraParams:
671671
KEY = 'LINT-EXTRA-PARAMS'
672672

673-
_CUSTOM_CLANG_FORMAT_BIN_ALLOWED_PATHS = ('ads', 'bigrt', 'grut', 'yabs')
673+
_CUSTOM_CLANG_FORMAT_ALLOWED_PATHS = ('ads', 'bigrt', 'grut', 'yabs', 'maps')
674674

675675
@classmethod
676676
def from_macro_args(cls, unit, flat_args, spec_args):
@@ -680,9 +680,9 @@ def from_macro_args(cls, unit, flat_args, spec_args):
680680
message = 'Wrong EXTRA_PARAMS value: "{}". Values must have format "name=value".'.format(arg)
681681
ymake.report_configure_error(message)
682682
raise DartValueError()
683-
if 'clang_format_bin' in arg:
683+
if 'custom_clang_format' in arg:
684684
upath = unit.path()[3:]
685-
if not upath.startswith(cls._CUSTOM_CLANG_FORMAT_BIN_ALLOWED_PATHS):
685+
if not upath.startswith(cls._CUSTOM_CLANG_FORMAT_ALLOWED_PATHS):
686686
message = f'Custom clang-format is not allowed in upath: {upath}'
687687
ymake.report_configure_error(message)
688688
raise DartValueError()

‎build/plugins/lib/test_const/__init__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
NYC_RESOURCE = 'NYC_RESOURCE_GLOBAL'
182182
RUFF_RESOURCE = 'RUFF_RESOURCE_GLOBAL'
183183
CLANG_FORMAT_RESOURCE = 'CLANG_FORMAT_RESOURCE_GLOBAL'
184-
CLANG_FORMAT_15_RESOURCE = 'CLANG_FORMAT_15_RESOURCE_GLOBAL'
185184

186185
# test_tool resource for host platform.
187186
# source - build/platform/test_tool/host.ya.make.inc.
@@ -452,6 +451,7 @@ class CppLinterName(Enum):
452451
ClangFormat = "clang_format"
453452
ClangFormatYT = "clang_format_yt"
454453
ClangFormat15 = "clang_format_15"
454+
ClangFormat18Vanilla = "clang_format_18_vanilla"
455455

456456

457457
class DefaultLinterConfig(Enum):
@@ -467,6 +467,7 @@ class LinterConfigsValidationRules(Enum):
467467
LINTER_CONFIG_TYPES = {
468468
CppLinterName.ClangFormat: (".clang-format",),
469469
CppLinterName.ClangFormat15: (".clang-format",),
470+
CppLinterName.ClangFormat18Vanilla: (".clang-format",),
470471
CppLinterName.ClangFormatYT: (".clang-format",),
471472
PythonLinterName.Black: ("pyproject.toml",),
472473
PythonLinterName.Ruff: ("pyproject.toml", "ruff.toml"),

‎contrib/libs/apache/orc/c++/include/orc/orc-config.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef ORC_CONFIG_HH
2020
#define ORC_CONFIG_HH
2121

22-
#define ORC_VERSION "2.1.0"
22+
#define ORC_VERSION "2.1.1"
2323

2424
#define ORC_CXX_HAS_CSTDINT
2525

‎contrib/libs/apache/orc/c++/src/Adaptor-linux.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#define HAS_PREAD
2323
#define HAS_STRPTIME
2424
#define HAS_DIAGNOSTIC_PUSH
25-
#define HAS_DOUBLE_TO_STRING
26-
#define HAS_INT64_TO_STRING
25+
/* #undef HAS_DOUBLE_TO_STRING */
26+
/* #undef HAS_INT64_TO_STRING */
2727
#define HAS_PRE_1970
2828
#define HAS_POST_2038
2929
#define HAS_STD_ISNAN

‎contrib/libs/apache/orc/ya.make

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Generated by devtools/yamaker from nixpkgs 22.11.
1+
# Generated by devtools/yamaker from nixpkgs 24.05.
22

33
LIBRARY()
44

55
LICENSE(Apache-2.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(2.1.0)
9+
VERSION(2.1.1)
1010

11-
ORIGINAL_SOURCE(https://github.com/apache/orc/archive/rel/release-2.1.0.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/apache/orc/archive/rel/release-2.1.1.tar.gz)
1212

1313
PEERDIR(
1414
contrib/libs/apache/orc-format

‎contrib/python/cachetools/py3/.dist-info/METADATA

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.2
22
Name: cachetools
3-
Version: 5.5.1
3+
Version: 5.5.2
44
Summary: Extensible memoizing collections and decorators
55
Home-page: https://github.com/tkem/cachetools/
66
Author: Thomas Kemmer
@@ -126,7 +126,7 @@ Related Projects
126126
License
127127
------------------------------------------------------------------------
128128

129-
Copyright (c) 2014-2024 Thomas Kemmer.
129+
Copyright (c) 2014-2025 Thomas Kemmer.
130130

131131
Licensed under the `MIT License`_.
132132

‎contrib/python/cachetools/py3/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2024 Thomas Kemmer
3+
Copyright (c) 2014-2025 Thomas Kemmer
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

‎contrib/python/cachetools/py3/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Related Projects
100100
License
101101
------------------------------------------------------------------------
102102

103-
Copyright (c) 2014-2024 Thomas Kemmer.
103+
Copyright (c) 2014-2025 Thomas Kemmer.
104104

105105
Licensed under the `MIT License`_.
106106

0 commit comments

Comments
 (0)