Skip to content

Commit fcf37dd

Browse files
adameatadameat
committed
Merge branch 'ydb-platform:main' into main
2 parents 4b94357 + 77fe782 commit fcf37dd

File tree

1,561 files changed

+47719
-50479
lines changed

Some content is hidden

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

1,561 files changed

+47719
-50479
lines changed

‎.github/actions/build_ya/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ runs:
8585
echo "::debug::get version"
8686
./ya --version
8787
88-
./ya make -k --build "${build_type}" --force-build-depends -D'BUILD_LANGUAGES=CPP PY3 PY2 GO' -T --stat \
88+
./ya make -k --build "${build_type}" --force-build-depends -D'BUILD_LANGUAGES=CPP PY3 PY2 GO' -T --stat -DCONSISTENT_DEBUG \
8989
--log-file "$TMP_DIR/ya_log.txt" --evlog-file "$TMP_DIR/ya_evlog.jsonl" \
9090
--cache-size 512G --link-threads "${{ inputs.link_threads }}" \
9191
"${extra_params[@]}" || (

‎.github/actions/test_ya/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ runs:
217217
echo "::debug::start tests"
218218
219219
./ya test "${params[@]}" \
220-
--bazel-remote-put --bazel-remote-username "${{ inputs.bazel_remote_username }}" --bazel-remote-password "${{ inputs.bazel_remote_password }}" \
220+
--bazel-remote-put --bazel-remote-username "${{ inputs.bazel_remote_username }}" --bazel-remote-password "${{ inputs.bazel_remote_password }}" -DCONSISTENT_DEBUG \
221221
--log-file "$LOG_DIR/ya_log_prewarm.txt" --evlog-file "$LOG_DIR/ya_evlog_prewarm.jsonl" \
222222
--dist-cache-evict-bins --cache-tests --no-dir-outputs --test-node-output-limit 100000 --drop-graph-result-before-tests || (
223223
RC=$?
@@ -227,7 +227,7 @@ runs:
227227
228228
echo "::debug::save tests reports"
229229
./ya test "${params[@]}" \
230-
--stat --log-file "$LOG_DIR/ya_log.txt" --evlog-file "$LOG_DIR/ya_evlog.jsonl" \
230+
--stat --log-file "$LOG_DIR/ya_log.txt" --evlog-file "$LOG_DIR/ya_evlog.jsonl" -DCONSISTENT_DEBUG \
231231
--cache-tests --dist-cache-evict-bins --no-dir-outputs --test-node-output-limit 100000 --drop-graph-result-before-tests \
232232
--junit "$JUNIT_REPORT_XML" --output "$OUT_DIR" || (
233233
RC=$?

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ __pycache__/
3636
/build-*
3737

3838
.idea/
39+
.vscode/
3940

4041
# KDevelop IDE
4142
*.kdev4

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
## YDB
88

99
[Website](https://ydb.tech) |
10-
[Documentation](https://ydb.tech/en/docs) |
10+
[Documentation](https://ydb.tech/docs/en/) |
1111
[Official Repository](https://github.com/ydb-platform/ydb) |
1212
[Blog](https://blog-redirect.ydb.tech) |
1313
[YouTube](https://www.youtube.com/c/YDBPlatform) |

‎build/conf/java.conf

+25-7
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,24 @@ multimodule JAVA_PROGRAM {
7474
}
7575
}
7676

77+
### Usage JUNIT_TESTS_JAR(path/to/some/peer realname.jar)
78+
###
79+
### Specifies jar to search test suites and test cases. By default tests are
80+
### searched in the jar compild by JTEST or JUNIT5 module sources. This macro
81+
### allows to specify diferent jar to search tests.
82+
###
83+
### Only one jar file is used to search tests. If this macro invoked multiple
84+
### times (which is not reccomended practice) only the last invocation will
85+
### have effect.
86+
###
87+
### If this macro is used no test from the module build by current ya.make
88+
### will be searched and executed.
89+
macro JUNIT_TESTS_JAR(Dir, Jar) {
90+
SET(UNITTEST_DIR $Dir)
91+
PEERDIR($Dir)
92+
SET(UNITTEST_MOD $Dir/$Jar)
93+
}
94+
7795
BUILD_JUNIT5_JAR_SEM=$BUILD_JAR_SEM && junit5_test
7896

7997
multimodule JUNIT5 {
@@ -102,6 +120,7 @@ multimodule JUNIT5 {
102120
.FINAL_TARGET=no
103121
.DEFAULT_NAME_GENERATOR=FullPath
104122
.SEM=BUILD_JUNIT5_JAR_SEM
123+
.IGNORED=JUNIT_TESTS_JAR
105124

106125
PEERDIR+=devtools/junit5-runner
107126
PEERDIR+=build/platform/java/jacoco-agent
@@ -157,6 +176,7 @@ multimodule JTEST {
157176
.FINAL_TARGET=no
158177
.DEFAULT_NAME_GENERATOR=FullPath
159178
.SEM=BUILD_JUNIT4_JAR_SEM
179+
.IGNORED=JUNIT_TESTS_JAR
160180

161181
SET(MODULE_TYPE JTEST)
162182
DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
@@ -197,6 +217,7 @@ multimodule JTEST_FOR {
197217
# |-> FORBID_CONFLICT_DM_RECENT = FAIL (because downgrade from v1.4 to v1.1 is detected before understanding that v1.4 was excuded on the examined path)
198218
.IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM JAVA_DEPENDENCIES_CONFIGURATION PROVIDES FEATURE_VERSION
199219
.ALIASES=JAVA_TEST_PEERDIR=PEERDIR JAVA_TEST_EXCLUDE=EXCLUDE
220+
.RESTRICTED=JUNIT_TESTS_JAR
200221
.PEERDIRSELF=JAR_COMPILATION
201222
.SEM=PROGRAM_AND_TESTS_CP_COLLECTING_NODES_SEM
202223

@@ -210,6 +231,7 @@ multimodule JTEST_FOR {
210231
.FINAL_TARGET=no
211232
.DEFAULT_NAME_GENERATOR=FullPath
212233
.SEM=BUILD_JUNIT4_JAR_SEM
234+
.RESTRICTED=JUNIT_TESTS_JAR
213235

214236
SET(MODULE_TYPE JTEST_FOR)
215237
DEPENDS(contrib/java/org/sonarsource/scanner/cli/sonar-scanner-cli/2.8)
@@ -272,7 +294,7 @@ module EXTERNAL_JAVA_LIBRARY: _BASE_UNIT {
272294
.ALIASES=SRCS=_SRCS_NO_GLOBAL
273295
.ALLOWED=EMBED_JAVA_VCS_INFO
274296
.RESTRICTED=EXTERNAL_JAR
275-
.GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_CLASSPATH
297+
.GLOBAL=MAVEN_EXPORT_COORDS
276298

277299
PEERDIR(build/platform/java/jdk)
278300
PEERDIR+=$JDK_RESOURCE_PEERDIR $EXTERNAL_JAVA_EXTRA_PEERDIR
@@ -440,7 +462,6 @@ module _JAR_BASE: _BARE_UNIT {
440462
.ALLOWED=EMBED_JAVA_VCS_INFO DEPENDENCY_MANAGEMENT EXCLUDE
441463
.DEFAULT_NAME_GENERATOR=TwoDirNames
442464
.RESTRICTED=WITH_JDK RESOURCE RESOURCE_FILES
443-
.GLOBAL=EXPORT_GRADLE_CLASSPATH
444465

445466
PEERDIR_TAGS=JAVA_PROTO JAVA_FBS JAVA_IDL DLL JAR_COMPILATION __EMPTY__
446467

@@ -506,8 +527,6 @@ JAVA_CONTRIB_SEM= \
506527
consumer-classpath $EXPORT_GRADLE_CLASSPATH \
507528
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
508529
&& consumer-type contrib \
509-
&& peers_closure $MANAGED_PEERS_CLOSURE \
510-
&& peers_closure_coords $EXPORT_GRADLE_CLASSPATH_GLOBAL \
511530
&& IGNORED
512531

513532
# tag:java-specific
@@ -516,7 +535,7 @@ module JAVA_CONTRIB: _JAR_BASE {
516535
.PEERDIR_POLICY=as_include
517536
.SEM=JAVA_CONTRIB_SEM
518537
.FINAL_TARGET=yes
519-
.GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_CLASSPATH
538+
.GLOBAL=MAVEN_EXPORT_COORDS
520539

521540
when ($JAR_RESOURCE_ID) {
522541
FETCH_TARGET_JAR= && $_FETCH_CONTRIB($JAR_RESOURCE_ID ${BINDIR}/${MODULE_PREFIX}${REALPRJNAME}${MODULE_SUFFIX})
@@ -868,7 +887,6 @@ BUILD_JAR_SEM= \
868887
&& consumer-classpath $EXPORT_GRADLE_CLASSPATH \
869888
&& consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
870889
&& consumer-type library \
871-
&& excludes_rules $EXCLUDE_VALUE \
872890
$_KOTLIN_SEM \
873891
$_JAR_MAIN_SEM \
874892
$_GRADLE_EXPORT_PUBLISHING_SEM \
@@ -894,7 +912,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
894912
.FINAL_TARGET=yes
895913
.ALIASES=JAVA_SRCS=FULL_JAVA_SRCS ANNOTATION_PROCESSOR=JAR_ANNOTATION_PROCESSOR
896914
.RESTRICTED=EXTERNAL_JAR
897-
.GLOBAL=MAVEN_EXPORT_COORDS EXPORT_GRADLE_CLASSPATH
915+
.GLOBAL=MAVEN_EXPORT_COORDS
898916
MODULE_SUFFIX=.jar
899917

900918
PEERDIR(build/platform/java/jdk)

‎build/conf/proto.conf

+10
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CPP_PROTO_OUTS=
3030
CPP_PROTO_OUTS_SEM=
3131
CPP_PROTO_SUFFIXES=.pb.h .pb.cc
3232
CPP_PROTO_PLUGINS=
33+
CPP_PROTO_NO_DBGINFO=no
3334

3435
# tag:proto tag:cpp-specific
3536
CPP_EV_OPTS=--plugin=protoc-gen-event2cpp=${tool:"tools/event2cpp"} --event2cpp_out=$ARCADIA_BUILD_ROOT -I=$ARCADIA_ROOT/library/cpp/eventlog
@@ -50,6 +51,14 @@ JAVA_PROTO_ARGS=
5051
# tag:proto tag:python-specific
5152
OPTIMIZE_PY_PROTOS_FLAG=no
5253

54+
# tag:proto
55+
### @usage: CPP_PROTOLIBS_DEBUG_INFO()
56+
###
57+
### Eqvivalent to NO_DEBUG_INFO() macro if the flag CPP_PROTO_NO_DBGINFO=yes
58+
macro CPP_PROTOLIBS_DEBUG_INFO() {
59+
SET(NO_DEBUGINFO $CPP_PROTO_NO_DBGINFO)
60+
}
61+
5362
# tag:internal
5463
### @usage: _ORDER_ADDINCL([BUILD ...] [SOURCE ...] Args...) # internal
5564
###
@@ -638,6 +647,7 @@ multimodule PROTO_LIBRARY {
638647
ENABLE(CPP_PROTO)
639648
ENABLE(GEN_PROTO)
640649
NO_CLANG_TIDY()
650+
CPP_PROTOLIBS_DEBUG_INFO()
641651
SET(PEERDIR_TAGS CPP_PROTO)
642652

643653
when ($BUILD_PROTO_AS_EVLOG == "yes" && $USE_VANILLA_PROTOC == "yes") {

‎build/export_generators/gradle/build.gradle.kts.jinja

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ dependencies {
4444
{% for library in target.consumer -%}
4545
{% set classpath = library.classpath -%}
4646
{% if targets|selectattr("app_main_class") -%}
47-
{% if target.lib_excludes is defined and target.lib_excludes[classpath]|length > 0 -%}
47+
{% if library.excludes.consumer is defined %}
4848
implementation({{ classpath }}) {
49-
{% for exclude in target.lib_excludes[classpath] -%}
50-
exclude group: '{{ exclude[0] }}', module: '{{ exclude[1] }}'
49+
{% for exclude in library.excludes.consumer -%}
50+
{% set classpath_parts = exclude.classpath.split(':') -%}
51+
exclude group: '{{ classpath_parts[0] }}', module: '{{ classpath_parts[1] }}'
5152
{% endfor -%}
5253
}
5354
{% else -%}

‎build/export_generators/gradle/generator.toml

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ add_vcs_info_to_mf="bool"
2020
junit4_test="flag"
2121
junit5_test="flag"
2222
app_main_class="str"
23-
peers_closure="list"
24-
peers_closure_coords="list"
25-
excludes_rules="list"
2623

2724
publish="flag"
2825
publish_group="str"

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ dependencies {
6868
{% for library in target.consumer -%}
6969
{% set classpath = library.classpath -%}
7070
{% if targets|selectattr("app_main_class") -%}
71-
{% if target.lib_excludes is defined and target.lib_excludes[classpath]|length > 0 -%}
71+
{% if library.excludes.consumer is defined %}
7272
implementation({{ classpath }}) {
73-
{% for exclude in target.lib_excludes[classpath] -%}
74-
exclude group: '{{ exclude[0] }}', module: '{{ exclude[1] }}'
73+
{% for exclude in library.excludes.consumer -%}
74+
{% set classpath_parts = exclude.classpath.split(':') -%}
75+
exclude group: '{{ classpath_parts[0] }}', module: '{{ classpath_parts[1] }}'
7576
{% endfor -%}
7677
}
7778
{% else -%}

‎build/export_generators/ide-gradle/generator.toml

-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ add_vcs_info_to_mf="bool"
1919
junit4_test="flag"
2020
junit5_test="flag"
2121
app_main_class="str"
22-
peers_closure="list"
23-
peers_closure_coords="list"
24-
excludes_rules="list"
2522
jar_source_set="list"
2623

2724
publish="flag"

‎build/external_resources/yexport/resources.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:5534004877"
4+
"uri": "sbr:5562968267"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:5534041285"
7+
"uri": "sbr:5562965675"
88
},
99
"linux": {
10-
"uri": "sbr:5534030737"
10+
"uri": "sbr:5562947428"
1111
}
1212
}
1313
}

‎build/external_resources/ymake/public.resources.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:5509380757"
4+
"uri": "sbr:5569062376"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:5509369518"
7+
"uri": "sbr:5569072879"
88
},
99
"linux": {
10-
"uri": "sbr:5509364024"
10+
"uri": "sbr:5569070627"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:5509360013"
13+
"uri": "sbr:5569095361"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:5509388614"
16+
"uri": "sbr:5569066861"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:5509343907"
4+
"uri": "sbr:5569055879"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:5509345716"
7+
"uri": "sbr:5569046692"
88
},
99
"linux": {
10-
"uri": "sbr:5509364685"
10+
"uri": "sbr:5569080477"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:5509354435"
13+
"uri": "sbr:5569058127"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:5509351251"
16+
"uri": "sbr:5569069854"
1717
}
1818
}
1919
}

0 commit comments

Comments
 (0)