Skip to content

Commit 9d12207

Browse files
maximyurchukmaximyurchuk
committed
Merge branch 'main' of https://github.com/ydb-platform/ydb into roll_fixture
2 parents 26a2103 + c2d2843 commit 9d12207

File tree

663 files changed

+29839
-4736
lines changed

Some content is hidden

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

663 files changed

+29839
-4736
lines changed

‎.github/config/muted_ya.txt

Lines changed: 265 additions & 22 deletions
Large diffs are not rendered by default.

‎.github/workflows/create_issues_for_muted_tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: Create issues for muted tests
22

33
on:
4-
pull_request_target:
5-
types: [review_submitted]
4+
pull_request_review:
5+
types:
6+
- submitted
67
branches:
78
- main
8-
- 'stable*'
9+
- 'stable-*'
910
workflow_dispatch:
1011
inputs:
1112
pr_number:
@@ -21,7 +22,7 @@ jobs:
2122
create-issues-for-muted-tests:
2223
runs-on: ubuntu-latest
2324
if: |
24-
(github.event_name == 'pull_request_target' &&
25+
(github.event_name == 'pull_request_review' &&
2526
github.event.review.state == 'approved' &&
2627
contains(github.event.pull_request.labels.*.name, 'mute-unmute')) ||
2728
github.event_name == 'workflow_dispatch'

‎.github/workflows/pr_check.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,16 +219,6 @@ jobs:
219219
timeout: 240
220220
build_target: "ydb/"
221221
test_size: small,medium
222-
- build_preset: release-msan
223-
threads_count: 20
224-
timeout: 480
225-
build_target: "ydb/"
226-
test_size: small,medium
227-
- build_preset: release-tsan
228-
threads_count: 20
229-
timeout: 600
230-
build_target: "ydb/"
231-
test_size: small,medium
232222
runs-on: [ self-hosted, auto-provisioned, "${{ format('build-preset-{0}', matrix.build_preset) }}" ]
233223
name: Build and test ${{ matrix.build_preset }}
234224
steps:

‎.github/workflows/update_muted_ya.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Update Muted tests
22

33
on:
44
schedule:
5-
- cron: "0 12 * * *" # At 12-00 UTC every day
5+
- cron: "0 6-20/2 * * *" # Every 2 hours from 6:00 to 20:00 UTC
66
workflow_dispatch:
77
inputs:
88
branches:
@@ -15,7 +15,7 @@ env:
1515
BRANCH_FOR_PR: update-muted-ya
1616
TITLE: "Update muted_ya.txt"
1717
REVIEWERS: "['ci']"
18-
LABEL: mute-unmute
18+
LABELS: "mute-unmute,not-for-changelog,ok-to-test"
1919
BUILD_TYPE: relwithdebinfo # Используем только один тип сборки
2020

2121
jobs:
@@ -230,11 +230,12 @@ jobs:
230230
repo: context.repo.repo,
231231
body: completeBody
232232
});
233-
233+
234+
const labelsToAdd = process.env.LABELS.split(',');
234235
github.rest.issues.addLabels({
235236
...context.repo,
236237
issue_number: ${{ steps.create_or_update_pr.outputs.pr_number }},
237-
labels: ['${{ env.LABEL }}']
238+
labels: labelsToAdd
238239
});
239240

240241
- name: Add reviewers
@@ -247,3 +248,17 @@ jobs:
247248
pull_number: ${{ steps.create_or_update_pr.outputs.pr_number }}
248249
team_reviewers: ${{ env.REVIEWERS }}
249250
token: ${{ secrets.YDBOT_TOKEN }}
251+
- name: Enable auto-merge
252+
if: env.changes == 'true'
253+
uses: actions/github-script@v7
254+
with:
255+
github-token: ${{ secrets.YDBOT_TOKEN }}
256+
script: |
257+
const pr = ${{ steps.create_or_update_pr.outputs.pr_number }};
258+
await github.rest.pulls.update({
259+
owner: context.repo.owner,
260+
repo: context.repo.repo,
261+
pull_number: pr,
262+
auto_merge: true
263+
});
264+

‎build/conf/go.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ module GO_PROGRAM: _GO_BASE_UNIT {
895895
PEERDIR += contrib/libs/cxxsupp/builtins
896896
}
897897

898-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
898+
when ($OS_WINDOWS == "yes") {
899899
MODULE_SUFFIX=.exe
900900
}
901901

@@ -952,7 +952,7 @@ module _GO_DLL_BASE_UNIT: GO_PROGRAM {
952952

953953
GO_PACKAGE_NAME(main)
954954

955-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
955+
when ($OS_WINDOWS == "yes") {
956956
MODULE_SUFFIX=.dll
957957
}
958958
elsewhen ($DARWIN == "yes" || $OS_IOS == "yes") {

‎build/conf/linkers/ld.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ END_WHOLE_ARCHIVE_VALUE=
99
LD_STRIP_FLAG=
1010
_SONAME_OPTION=
1111
_LD_SRCS_GLOBALS=--start-wa ${rootrel;ext=.a:SRCS_GLOBAL} --end-wa ${rootrel;ext=.o:SRCS_GLOBAL} ${rootrel;ext=.supp:SRCS_GLOBAL}
12-
when ($OS_LINUX == "yes" || $OS_ANDROID == "yes" || $OS_CYGWIN == "yes" || $OS_NONE == "yes") {
12+
when ($OS_LINUX == "yes" || $OS_ANDROID == "yes" || $OS_NONE == "yes") {
1313
_START_GROUP=-Wl,--start-group
1414
_END_GROUP=-Wl,--end-group
1515
START_WHOLE_ARCHIVE_VALUE=-Wl,--whole-archive

‎build/conf/project_specific/yql_udf.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ multimodule YQL_UDF {
167167
_ADD_YQL_UDF_DEPS()
168168
# disable credits generation for static library
169169
SET(CREDITS_FLAGS)
170-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
170+
when ($OS_WINDOWS == "yes") {
171171
MODULE_SUFFIX=.static.lib
172172
}
173173
}
@@ -188,7 +188,7 @@ multimodule YQL_UDF_YDB {
188188
_ADD_YQL_UDF_YDB_DEPS()
189189
# disable credits generation for static library
190190
SET(CREDITS_FLAGS)
191-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
191+
when ($OS_WINDOWS == "yes") {
192192
MODULE_SUFFIX=.static.lib
193193
}
194194
}
@@ -207,7 +207,7 @@ multimodule YQL_UDF_CONTRIB {
207207
_ADD_YQL_UDF_DEPS_CONTRIB()
208208
# disable credits generation for static library
209209
SET(CREDITS_FLAGS)
210-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
210+
when ($OS_WINDOWS == "yes") {
211211
MODULE_SUFFIX=.static.lib
212212
}
213213
}

‎build/conf/proto.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PY_PROTOC=${tool:"contrib/tools/protoc"}
66
when ($PYTHON2 == "yes") {
77
PY_PROTOC=${PROTOC_OLD}
88
}
9-
JAVA_PROTOC=${tool:"build/platform/java/protoc"}
9+
JAVA_PROTOC=${tool:"build/platform/java/protoc"} ${hide:JAVA_PROTO_COMPILER_VERSION}
1010

1111
when ($OPENSOURCE_REPLACE_PROTOBUF) {
1212
PROTOC_STYLEGUIDE_OUT=

‎build/conf/python.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# tag:python-specific tag:cython-specific
2-
CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:CYTHON_FAKE_ID} $CYTHON_PREDEFINED_INCLUDES
2+
CYTHON_SCRIPT=${input:"${ARCADIA_ROOT}/contrib/tools/cython/cython.py"} ${hide:CYTHON_FAKEID} $CYTHON_PREDEFINED_INCLUDES
33
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
44
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
55
PYTHON_TYPE_FOR_CYTHON=PY3
@@ -470,7 +470,7 @@ module PY_ANY_MODULE: DLL_UNIT {
470470
PEERDIR+=build/platform/python
471471
}
472472
otherwise {
473-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
473+
when ($OS_WINDOWS == "yes") {
474474
LDFLAGS+=$PYTHON_LIBRARIES
475475
}
476476
}
@@ -493,7 +493,7 @@ module PY_ANY_MODULE: DLL_UNIT {
493493
}
494494
}
495495

496-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
496+
when ($OS_WINDOWS == "yes") {
497497
MODULE_PREFIX=
498498
MODULE_SUFFIX=.pyd
499499
}
@@ -614,7 +614,7 @@ module PY2_LIBRARY: _LIBRARY {
614614
when ($NO_PYTHON_INCLS != "yes") {
615615
PEERDIR+=contrib/libs/python
616616
}
617-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
617+
when ($OS_WINDOWS == "yes") {
618618
MODULE_PREFIX=py
619619
}
620620
otherwise {
@@ -656,7 +656,7 @@ module PY3_LIBRARY: _LIBRARY {
656656
when ($NO_PYTHON_INCLS != "yes") {
657657
PEERDIR+=contrib/libs/python
658658
}
659-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
659+
when ($OS_WINDOWS == "yes") {
660660
MODULE_PREFIX=py3
661661
}
662662
otherwise {
@@ -1140,7 +1140,7 @@ multimodule PY23_NATIVE_LIBRARY {
11401140
.GLOBAL_SEM=_CPP_OBJ_LIBRARY_SEM
11411141
PYTHON3_ADDINCL()
11421142
SET(MODULE_LANG CPP)
1143-
when ($OS_WINDOWS == "yes" || $CYGWIN == "yes") {
1143+
when ($OS_WINDOWS == "yes") {
11441144
MODULE_PREFIX=py3c
11451145
}
11461146
otherwise {

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tasks.compileJava.configure {
1313
tasks.compileTestJava.configure {
1414
dependsOn({{ taskvar }})
1515
}
16-
{%- if current_target.use_annotation_processor|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length %}
16+
{%- if not(disable_lombok_plugin) and (current_target.use_annotation_processor|select('startsWith', 'contrib/java/org/projectlombok/lombok')|length) %}
1717
tasks.getByName("delombok").mustRunAfter({{ taskvar }})
1818
{%- endif -%}
1919

@@ -27,6 +27,11 @@ tasks.compileKotlin.configure {
2727
tasks.compileTestKotlin.configure {
2828
dependsOn({{ taskvar }})
2929
}
30+
{%- if with_kapt or with_test_kapt %}
31+
tasks.withType<KaptGenerateStubsTask>().configureEach {
32+
mustRunAfter({{ taskvar }})
33+
}
34+
{%- endif -%}
3035
{% endif -%}
3136
{%- endmacro -%}
3237

@@ -54,13 +59,3 @@ tasks.getByName("{{ parent_taskvar }}").dependsOn({{ taskvar }})
5459
{%- include "[generator]/codegen_current_target.jinja" -%}
5560
{%- endfor -%}
5661
{%- endif -%}
57-
58-
{%- if not proto_template %}
59-
60-
tasks.getByName("sourcesJar").dependsOn(tasks.compileJava)
61-
tasks.getByName("sourcesJar").mustRunAfter(tasks.compileTestJava)
62-
{%- if with_kotlin %}
63-
tasks.getByName("sourcesJar").dependsOn(tasks.compileKotlin)
64-
tasks.getByName("sourcesJar").mustRunAfter(tasks.compileTestKotlin)
65-
{%- endif %}
66-
{%- endif -%}

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

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
1+
{%- set all_targets = [] -%}
12
{%- if target is defined -%}
2-
{%- set publish = target.publish -%}
3-
{%- set with_kotlin = target.with_kotlin -%}
4-
{%- if with_kotlin -%}
5-
{%- set kotlin_version = target.kotlin_version -%}
6-
{%- set with_kotlinc_plugin_allopen = target.with_kotlinc_plugin_allopen -%}
7-
{%- set with_kotlinc_plugin_noarg = target.with_kotlinc_plugin_noarg -%}
8-
{%- endif -%}
9-
{%- set has_errorprone = target.use_errorprone and not disable_errorprone and target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length -%}
10-
{%- else -%}
11-
{#- No target, only extra_targets, get main features from extra_targets -#}
12-
{%- set publish = extra_targets|selectattr('publish', 'eq', true)|length -%}
13-
{%- set with_kotlin = extra_targets|selectattr('with_kotlin', 'eq', true)|length -%}
14-
{%- if with_kotlin -%}
15-
{%- set kotlin_version = extra_targets|selectattr('kotlin_version')|map(attribute='kotlin_version')|first -%}
16-
{%- set with_kotlinc_plugin_allopen = extra_targets|selectattr('with_kotlinc_plugin_allopen')|map(attribute='with_kotlinc_plugin_allopen')|sum -%}
17-
{%- set with_kotlinc_plugin_noarg = extra_targets|selectattr('with_kotlinc_plugin_noarg')|map(attribute='with_kotlinc_plugin_noarg')|sum -%}
18-
{%- endif -%}
19-
{%- set has_errorprone = extra_targets|selectattr('use_errorprone', 'eq', true)|length and not disable_errorprone and extra_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length -%}
3+
{%- set all_targets = all_targets + [target] -%}
4+
{%- endif -%}
5+
{%- if extra_targets|length -%}
6+
{%- set all_targets = all_targets + extra_targets -%}
7+
{%- endif -%}
8+
9+
{%- set publish = all_targets|selectattr('publish', 'eq', true)|length -%}
10+
11+
{#- Kotlin -#}
12+
{%- set with_kotlin = all_targets|selectattr('with_kotlin', 'eq', true)|length -%}
13+
{%- if with_kotlin -%}
14+
{%- set kotlin_version = all_targets|selectattr('kotlin_version')|map(attribute='kotlin_version')|first -%}
15+
{%- set with_kotlinc_plugin_allopen = all_targets|selectattr('with_kotlinc_plugin_allopen')|map(attribute='with_kotlinc_plugin_allopen')|sum -%}
16+
{%- set with_kotlinc_plugin_noarg = all_targets|selectattr('with_kotlinc_plugin_noarg')|map(attribute='with_kotlinc_plugin_noarg')|sum -%}
17+
{#- KAPT -#}
18+
{%- set with_kapt = target.with_kapt -%}
19+
{%- set with_test_kapt = extra_targets|selectattr('with_kapt', 'eq', true)|map(attribute='with_kapt')|length -%}
20+
{#- WAIT ya-bin release, disable just now -#}
21+
{%- set with_kapt = false -%}
22+
{%- set with_test_kapt = false -%}
23+
{%- endif -%}
24+
25+
{#- ErrorProne -#}
26+
{%- set with_errorprone = not(disable_errorprone) and (target.use_errorprone) and (target.consumer|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length) -%}
27+
{%- set with_test_errorprone = not(disable_errorprone) and (extra_targets|selectattr('use_errorprone', 'eq', true)|length) and (extra_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|length) -%}
28+
{%- if with_errorprone or with_test_errorprone -%}
29+
{%- set errorprones = all_targets|selectattr('consumer')|map(attribute='consumer')|sum|selectattr('classpath')|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations')|unique -%}
2030
{%- endif -%}
2131

2232
{%- include "[generator]/jdk.jinja" -%}

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

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{%- macro AnnotationProcessors(funcName, annotation_processors) -%}
22
{%- if annotation_processors|length -%}
3-
{%- set lomboks = annotation_processors|select('startsWith', 'contrib/java/org/projectlombok/lombok') -%}
4-
{%- for lombok in lomboks %}
5-
{{ funcName }}(files("$arcadia_root/{{ lombok }}"))
6-
{%- endfor -%}
7-
{%- set annotation_processors = annotation_processors|reject('in', lomboks) -%}
8-
{%- if annotation_processors|length -%}
9-
{%- for annotation_processor in annotation_processors %}
3+
{%- for annotation_processor in annotation_processors %}
104
{{ funcName }}(files("$arcadia_root/{{ annotation_processor }}"))
11-
{%- endfor -%}
12-
{%- endif -%}
5+
{%- endfor -%}
6+
{%- endif -%}
7+
{%- endmacro -%}
8+
9+
{%- macro Kapts(funcName, kapts) -%}
10+
{%- if kapts|length -%}
11+
{%- for kapt in kapts %}
12+
{{ funcName }}(files("$arcadia_root/{{ kapt }}"))
13+
{%- endfor -%}
1314
{%- endif -%}
1415
{%- endmacro -%}
1516

@@ -67,21 +68,26 @@
6768
{%- set test_file_jars = test_file_deps|map(attribute='jar')|reject("in", file_jars)|unique|sort -%}
6869

6970
dependencies {
70-
{%- if has_errorprone -%}
71-
{%- set errorprones = target.consumer|selectattr('classpath')|selectattr('jar', 'startsWith', 'contrib/java/com/google/errorprone/error_prone_annotations') -%}
72-
{%- if errorprones|length -%}
73-
{%- for errorprone in errorprones -%}
74-
{%- set errorprone_version = errorprone.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
75-
{%- set errorprone_parts = split(errorprone_version, '/', 2) %}
71+
{%- if errorprones|length -%}
72+
{%- for errorprone in errorprones -%}
73+
{%- set errorprone_version = errorprone.jar|replace("contrib/java/com/google/errorprone/error_prone_annotations/", "") -%}
74+
{%- set errorprone_parts = split(errorprone_version, '/', 2) %}
7675
errorprone("com.google.errorprone:error_prone_core:{{ errorprone_parts[0] }}")
77-
{%- endfor -%}
78-
{%- endif -%}
76+
{%- endfor -%}
7977
{%- endif -%}
8078
{#- glue -#}
8179
{{ AnnotationProcessors("annotationProcessor", target.use_annotation_processor) }}
8280
{%- for extra_target in extra_targets -%}
8381
{{ AnnotationProcessors("testAnnotationProcessor", extra_target.use_annotation_processor) }}
8482
{%- endfor -%}
83+
{%- if with_kapt -%}
84+
{{ Kapts("kapt", target.kapt.classpaths) }}
85+
{%- endif -%}
86+
{%- if with_test_kapt -%}
87+
{%- for extra_target in extra_targets -%}
88+
{{ Kapts("testKapt", extra_target.kapt.classpaths) }}
89+
{%- endfor -%}
90+
{%- endif -%}
8591
{#- glue -#}
8692
{{ AddNonFileDeps(target, file_classpaths, "implementation", "api") }}
8793
{%- for extra_target in extra_targets -%}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
{%- if has_errorprone -%}
1+
{%- if with_errorprone or with_test_errorprone -%}
22
import net.ltgt.gradle.errorprone.CheckSeverity
33
import net.ltgt.gradle.errorprone.errorprone
44

5-
{% endif -%}
5+
{% endif -%}
66
{%- if with_kotlin -%}
77
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
8-
9-
{% endif -%}
8+
{%- if with_kapt or with_test_kapt %}
9+
import org.jetbrains.kotlin.gradle.internal.KaptGenerateStubsTask
10+
{%- endif %}
11+
{% endif -%}

0 commit comments

Comments
 (0)