Skip to content

Commit

Permalink
Merge branch 'main' into ttl-tiering
Browse files Browse the repository at this point in the history
  • Loading branch information
swalrus1 authored Dec 4, 2024
2 parents 615a387 + d6a279e commit fac12a7
Show file tree
Hide file tree
Showing 1,383 changed files with 103,752 additions and 21,246 deletions.
2 changes: 2 additions & 0 deletions .github/config/muted_ya.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ydb/core/blobstorage/ut_blobstorage/ut_scrub BlobScrubbing.mirror3dc
ydb/core/blobstorage/ut_blobstorage/ut_scrub BlobScrubbing.mirror3of4
ydb/core/blobstorage/ut_mirror3of4 Mirror3of4.ReplicationSmall
ydb/core/blobstorage/ut_vdisk TBsVDiskGC.GCPutKeepBarrierSync
ydb/core/blobstorage/ut_vdisk TBsLocalRecovery.WriteRestartReadHugeDecreased
ydb/core/blobstorage/ut_vdisk TBsVDiskManyPutGet.ManyPutRangeGetCompactionIndexOnly
ydb/core/blobstorage/ut_vdisk [*/*] chunk chunk
ydb/core/cms/ut_sentinel_unstable TSentinelUnstableTests.BSControllerCantChangeStatus
Expand Down Expand Up @@ -91,6 +92,7 @@ ydb/services/datastreams/ut DataStreams.TestReservedStorageMetering
ydb/services/keyvalue/ut sole chunk chunk
ydb/services/keyvalue/ut sole+chunk+chunk
ydb/services/persqueue_v1/ut TPersQueueTest.DirectReadCleanCache
ydb/services/persqueue_v1/ut TPersQueueTest.DirectReadNotCached
ydb/services/persqueue_v1/ut [*/*] chunk chunk
ydb/services/persqueue_v1/ut [*/*]+chunk+chunk
ydb/services/ydb/sdk_sessions_pool_ut YdbSdkSessionsPool.StressTestSync1
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/sync_cmakebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
echo "No new commits on the main branch to merge, exiting"
exit 0
fi
git clone -b main --shallow-exclude cmakebuild https://[email protected]/$REPO.git ydb
git clone -b main https://[email protected]/$REPO.git ydb
git config --global user.email "[email protected]"
git config --global user.name "Alexander Smirnov"
cd ydb
Expand All @@ -40,11 +40,7 @@ jobs:
echo "Merge did not bring any changes, exiting"
exit
fi
# Generate ydb/core/base/generate with python codegen under ya
./ya make ydb/core/base/generated/
ydb/core/base/generated/codegen/codegen ydb/core/base/generated/runtime_feature_flags.h.in ydb/core/base/generated/runtime_feature_flags.h
ydb/core/base/generated/codegen/codegen ydb/core/base/generated/runtime_feature_flags.cpp.in ydb/core/base/generated/runtime_feature_flags.cpp
# Generate cmakelists using pregenerated ydb/core/base/generated/runtime_feature_flags.*
# Generate cmakelists
./generate_cmake -k
echo ${mainsha} > ydb/ci/cmakegen.txt
git add .
Expand Down
5 changes: 3 additions & 2 deletions build/config/tests/py_style/default_configs.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"black": "build/config/tests/py_style/config.toml",
"dummy_linter": "build/config/tests/py_style/dummy_linter_config.json",
"flake8": "build/config/tests/flake8/flake8.conf",
"py2_flake8": "build/config/tests/flake8/flake8.conf",
"black": "build/config/tests/py_style/config.toml",
"dummy_linter": "build/config/tests/py_style/dummy_linter_config.json"
"ruff": "build/config/tests/ruff/ruff.toml"
}
10 changes: 5 additions & 5 deletions build/external_resources/ymake/public.resources.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:7522713648"
"uri": "sbr:7570915389"
},
"darwin-arm64": {
"uri": "sbr:7522713246"
"uri": "sbr:7570915039"
},
"linux": {
"uri": "sbr:7522714449"
"uri": "sbr:7570916388"
},
"linux-aarch64": {
"uri": "sbr:7522712750"
"uri": "sbr:7570914495"
},
"win32-clang-cl": {
"uri": "sbr:7522714072"
"uri": "sbr:7570915900"
}
}
}
10 changes: 5 additions & 5 deletions build/external_resources/ymake/resources.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
"uri": "sbr:7522728679"
"uri": "sbr:7570909413"
},
"darwin-arm64": {
"uri": "sbr:7522728262"
"uri": "sbr:7570909172"
},
"linux": {
"uri": "sbr:7522729575"
"uri": "sbr:7570910246"
},
"linux-aarch64": {
"uri": "sbr:7522727825"
"uri": "sbr:7570908880"
},
"win32-clang-cl": {
"uri": "sbr:7522729138"
"uri": "sbr:7570909765"
}
}
}
14 changes: 14 additions & 0 deletions build/mapping.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@
"7480276291": "https://devtools-registry.s3.yandex.net/7480276291",
"7537937986": "https://devtools-registry.s3.yandex.net/7537937986",
"7538005601": "https://devtools-registry.s3.yandex.net/7538005601",
"7573694143": "https://devtools-registry.s3.yandex.net/7573694143",
"7573699373": "https://devtools-registry.s3.yandex.net/7573699373",
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
Expand Down Expand Up @@ -622,6 +624,7 @@
"7448914799": "https://devtools-registry.s3.yandex.net/7448914799",
"7478218557": "https://devtools-registry.s3.yandex.net/7478218557",
"7522713648": "https://devtools-registry.s3.yandex.net/7522713648",
"7570915389": "https://devtools-registry.s3.yandex.net/7570915389",
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
Expand Down Expand Up @@ -675,6 +678,7 @@
"7448913101": "https://devtools-registry.s3.yandex.net/7448913101",
"7478218228": "https://devtools-registry.s3.yandex.net/7478218228",
"7522713246": "https://devtools-registry.s3.yandex.net/7522713246",
"7570915039": "https://devtools-registry.s3.yandex.net/7570915039",
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
Expand Down Expand Up @@ -728,6 +732,7 @@
"7448917907": "https://devtools-registry.s3.yandex.net/7448917907",
"7478219259": "https://devtools-registry.s3.yandex.net/7478219259",
"7522714449": "https://devtools-registry.s3.yandex.net/7522714449",
"7570916388": "https://devtools-registry.s3.yandex.net/7570916388",
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
Expand Down Expand Up @@ -781,6 +786,7 @@
"7448911598": "https://devtools-registry.s3.yandex.net/7448911598",
"7478218007": "https://devtools-registry.s3.yandex.net/7478218007",
"7522712750": "https://devtools-registry.s3.yandex.net/7522712750",
"7570914495": "https://devtools-registry.s3.yandex.net/7570914495",
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
Expand Down Expand Up @@ -834,6 +840,7 @@
"7448916360": "https://devtools-registry.s3.yandex.net/7448916360",
"7478218861": "https://devtools-registry.s3.yandex.net/7478218861",
"7522714072": "https://devtools-registry.s3.yandex.net/7522714072",
"7570915900": "https://devtools-registry.s3.yandex.net/7570915900",
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
Expand Down Expand Up @@ -1514,6 +1521,8 @@
"7480276291": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"7537937986": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"7538005601": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"7573694143": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"7573699373": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
Expand Down Expand Up @@ -1686,6 +1695,7 @@
"7448914799": "devtools/ymake/bin/ymake for darwin",
"7478218557": "devtools/ymake/bin/ymake for darwin",
"7522713648": "devtools/ymake/bin/ymake for darwin",
"7570915389": "devtools/ymake/bin/ymake for darwin",
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
Expand Down Expand Up @@ -1739,6 +1749,7 @@
"7448913101": "devtools/ymake/bin/ymake for darwin-arm64",
"7478218228": "devtools/ymake/bin/ymake for darwin-arm64",
"7522713246": "devtools/ymake/bin/ymake for darwin-arm64",
"7570915039": "devtools/ymake/bin/ymake for darwin-arm64",
"5766173070": "devtools/ymake/bin/ymake for linux",
"5805432830": "devtools/ymake/bin/ymake for linux",
"5829031598": "devtools/ymake/bin/ymake for linux",
Expand Down Expand Up @@ -1792,6 +1803,7 @@
"7448917907": "devtools/ymake/bin/ymake for linux",
"7478219259": "devtools/ymake/bin/ymake for linux",
"7522714449": "devtools/ymake/bin/ymake for linux",
"7570916388": "devtools/ymake/bin/ymake for linux",
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
Expand Down Expand Up @@ -1845,6 +1857,7 @@
"7448911598": "devtools/ymake/bin/ymake for linux-aarch64",
"7478218007": "devtools/ymake/bin/ymake for linux-aarch64",
"7522712750": "devtools/ymake/bin/ymake for linux-aarch64",
"7570914495": "devtools/ymake/bin/ymake for linux-aarch64",
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
Expand Down Expand Up @@ -1898,6 +1911,7 @@
"7448916360": "devtools/ymake/bin/ymake for win32-clang-cl",
"7478218861": "devtools/ymake/bin/ymake for win32-clang-cl",
"7522714072": "devtools/ymake/bin/ymake for win32-clang-cl",
"7570915900": "devtools/ymake/bin/ymake for win32-clang-cl",
"4307890075": "flake8_linter for linux",
"5517245192": "flake8_linter for linux",
"4307901240": "flake8_linter for linux-aarch64",
Expand Down
16 changes: 16 additions & 0 deletions build/platform/mold/mold.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"by_platform": {
"darwin-arm64": {
"uri": "sbr:7421008516"
},
"darwin-x86_64": {
"uri": "sbr:7421180051"
},
"linux-aarch64": {
"uri": "sbr:7421207790"
},
"linux-x86_64": {
"uri": "sbr:7421606584"
}
}
}
13 changes: 13 additions & 0 deletions build/platform/mold/ya.make
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
RESOURCES_LIBRARY()

TOOLCHAIN(mold)
VERSION(2.34.1)

DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(MOLD_ROOT mold.json)

LDFLAGS(
-fuse-ld=mold
--ld-path=${MOLD_ROOT_RESOURCE_GLOBAL}/bin/ld.mold
)

END()
10 changes: 5 additions & 5 deletions build/platform/test_tool/host.ya.make.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538003967)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573697889)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538003163)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573697448)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538005601)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573699373)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538002456)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573696869)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7538004884)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573698723)

ENDIF()
10 changes: 5 additions & 5 deletions build/platform/test_tool/host_os.ya.make.inc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537936527)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573693387)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537935343)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573692847)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537937986)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573694143)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537934380)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573692312)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7537937248)
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7573693816)

ENDIF()
36 changes: 29 additions & 7 deletions build/plugins/_dart_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -611,15 +611,37 @@ def python_configs(cls, unit, flat_args, spec_args):
def cpp_configs(cls, unit, flat_args, spec_args):
custom_config = spec_args.get('CUSTOM_CONFIG')
if custom_config:
# TODO delete CUSTOM_CONFIG, it's used only by arc
config = custom_config[0]
assert_file_exists(unit, config)
else:
# file with default configs
config = spec_args.get('CONFIGS')[0]
assert_file_exists(unit, config)
name = spec_args['NAME'][0]
config = get_linter_configs(unit, config)[name]
assert_file_exists(unit, config)
return {cls.KEY: serialize_list([config])}
linter_name = spec_args['NAME'][0]
if config_type := spec_args.get('CONFIG_TYPE'):
config_type = config_type[0]
if config_type not in consts.LINTER_CONFIG_TYPES[linter_name]:
message = "Unknown CPP linter config type: {}. Allowed types: {}".format(
config_type, ', '.join(consts.LINTER_CONFIG_TYPES[linter_name])
)
ymake.report_configure_error(message)
raise DartValueError()
if common_configs_dir := unit.get('MODULE_COMMON_CONFIGS_DIR'):
config = os.path.join(common_configs_dir, config_type)
path = unit.resolve(config)
if os.path.exists(path):
config = _common.strip_roots(config)
return {cls.KEY: serialize_list([config])}
message = "File not found: {}".format(path)
ymake.report_configure_error(message)
raise DartValueError()
else:
message = "Config type specifier is only allowed with autoincludes"
ymake.report_configure_error(message)
raise DartValueError()
# default config
config = spec_args.get('CONFIGS')[0]
assert_file_exists(unit, config)
config = get_linter_configs(unit, config)[linter_name]
assert_file_exists(unit, config)
return {cls.KEY: serialize_list([config])}


Expand Down
Loading

0 comments on commit fac12a7

Please sign in to comment.