Skip to content

Commit 30608b4

Browse files
niksavelievniksaveliev
committed
Merge branch 'kafka-connect-distributed' of github.com:niksaveliev/ydb into kafka-connect-distributed
2 parents 32c4fe1 + c1a663e commit 30608b4

File tree

6,003 files changed

+14430
-2812353
lines changed

Some content is hidden

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

6,003 files changed

+14430
-2812353
lines changed

‎.github/config/muted_ya.txt

+2-7
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ ydb/core/kqp/ut/olap KqpOlapWrite.TierDraftsGCWithRestart
2424
ydb/core/kqp/ut/olap [*/*] chunk chunk
2525
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable+ColumnStore
2626
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable-ColumnStore
27-
ydb/core/kqp/ut/query KqpStats.SysViewClientLost
2827
ydb/core/kqp/ut/query KqpLimits.OutOfSpaceYQLUpsertFail+useSink
2928
ydb/core/kqp/ut/query KqpLimits.QSReplySizeEnsureMemoryLimits+useSink
29+
ydb/core/kqp/ut/query KqpStats.SysViewClientLost
3030
ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns
3131
ydb/core/kqp/ut/scheme KqpScheme.AlterAsyncReplication
3232
ydb/core/kqp/ut/scheme KqpScheme.AlterTransfer
3333
ydb/core/kqp/ut/scheme [*/*] chunk chunk
34-
ydb/core/kqp/ut/service KqpQueryService.ExecuteQueryWithResourcePoolClassifier
3534
ydb/core/kqp/ut/service [*/*] chunk chunk
3635
ydb/core/kqp/ut/spilling KqpScanSpilling.SelfJoinQueryService
3736
ydb/core/kqp/ut/tx KqpSinkTx.OlapInvalidateOnError
@@ -46,11 +45,9 @@ ydb/core/kqp/ut/tx KqpSnapshotIsolation.TReadOnlyOltpNoSink
4645
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TSimpleOltp
4746
ydb/core/kqp/ut/tx KqpSnapshotIsolation.TSimpleOltpNoSink
4847
ydb/core/kqp/ut/yql KqpScripting.StreamExecuteYqlScriptScanOperationTmeoutBruteForce
49-
ydb/core/mind/hive/ut THiveTest.TestReassignUseRelativeSpace
5048
ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient
5149
ydb/core/statistics/aggregator/ut AnalyzeColumnshard.AnalyzeRebootColumnShard
5250
ydb/core/tablet_flat/ut TSharedPageCache.ClockPro
53-
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_BTreeIndex
5451
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_FlatIndex
5552
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_ZeroCache_BTreeIndex
5653
ydb/core/tablet_flat/ut TSharedPageCache.Compaction_ZeroCache_FlatIndex
@@ -64,6 +61,7 @@ ydb/core/tx/schemeshard/ut_login_large TSchemeShardLoginLargeTest.RemoveLogin_Ma
6461
ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithData
6562
ydb/core/tx/schemeshard/ut_move_reboots TSchemeShardMoveRebootsTest.WithDataAndPersistentPartitionStats
6663
ydb/core/tx/schemeshard/ut_pq_reboots TPqGroupTestReboots.AlterWithReboots-PQConfigTransactionsAtSchemeShard-false
64+
ydb/core/tx/schemeshard/ut_pq_reboots TPqGroupTestReboots.AlterWithReboots-PQConfigTransactionsAtSchemeShard-true
6765
ydb/core/tx/tiering/ut ColumnShardTiers.TTLUsage
6866
ydb/core/viewer/tests test.py.test_viewer_nodes
6967
ydb/core/viewer/tests test.py.test_viewer_sysinfo
@@ -73,7 +71,6 @@ ydb/library/actors/interconnect/ut_huge_cluster sole chunk chunk
7371
ydb/library/yaml_config/ut_transform test_transform.py.TestYamlConfigTransformations.test_basic[args1-dump_ds_init]
7472
ydb/library/yql/dq/opt/ut HypergraphBuild.JoinTopologiesBenchmark
7573
ydb/library/yql/dq/opt/ut sole chunk chunk
76-
ydb/library/yql/providers/generic/connector/tests/datasource/ydb test.py.test_select_positive[column_selection_col2_COL1-kqprun]
7774
ydb/library/yql/providers/generic/connector/tests/join test.py.test_join[join_ch_ch-kqprun]
7875
ydb/library/yql/providers/generic/connector/tests/join test.py.test_join[join_pg_pg-kqprun]
7976
ydb/services/persqueue_v1/ut TPersQueueCommonTest.TestLimiterLimitsWithBlobsRateLimit
@@ -99,11 +96,9 @@ ydb/tests/fq/generic/streaming test_join.py.TestJoinStreaming.test_streamlookup[
9996
ydb/tests/fq/mem_alloc test_scheduling.py.TestSchedule.test_skip_busy[kikimr0]
10097
ydb/tests/fq/multi_plane [test_retry.py] chunk chunk
10198
ydb/tests/fq/multi_plane [test_retry_high_rate.py] chunk chunk
102-
ydb/tests/fq/s3 [test_format_setting.py] chunk chunk
10399
ydb/tests/fq/yds [*/*] chunk chunk
104100
ydb/tests/fq/yds test_2_selects_limit.py.TestSelectLimit.test_select_same[v1]
105101
ydb/tests/fq/yds test_2_selects_limit.py.TestSelectLimit.test_select_sequence[v1]
106-
ydb/tests/fq/yds test_big_state.py.TestBigState.test_gt_8mb[v1]
107102
ydb/tests/fq/yds test_mem_alloc.py.TestMemAlloc.test_hop_alloc[v1]
108103
ydb/tests/fq/yds test_mem_alloc.py.TestMemAlloc.test_join_alloc[v1]
109104
ydb/tests/fq/yds test_recovery.py.TestRecovery.test_ic_disconnection

‎.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

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ __pycache__/
3333

3434
# MacOS specific
3535
.DS_Store
36+
*.dSYM
3637

3738
# clangd cache
3839
/.cache

‎build/conf/java.conf

+8-7
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ COLLECT_CLASSPATH=${WRITER_PY} --file ${BINDIR}/bfg.txt -m --ya-start-command-fi
831831
LINK_CLASSPATH=${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/bfg.txt ${ARCADIA_BUILD_ROOT}/bfg.jar
832832
COMPILE_JAVA_SRCLIST=$_JAVAC_RUN_HELPER($JAVAC_CMD)
833833
PACK_JAR=$_PACK_JAR_HELPER($TARGET)
834-
LINK_JAR=${hide:JAVA_FAKEID} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:2"} \
834+
LINK_JAR=${hide:JAVA_FAKEID} ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:4"} \
835835
&& $PREPARE_JAR_BUILD \
836836
&& $_PREPARE_SRC_JAR \
837837
&& $ALL_KT_COMMANDS \
@@ -1047,7 +1047,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
10471047
when ($WITH_KAPT_VALUE == "yes") {
10481048
# For Kapt usage see: https://kotlinlang.org/docs/kapt.html#using-in-cli
10491049
# See for kapt.kotlin.generated: https://github.com/JetBrains/kotlin/blob/master/plugins/kapt3/kapt3-cli/testData/integration/kotlinFileGeneration/build.txt
1050-
_KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/1.9.24"} $KT_KAPT_PLUGIN_OPTS
1050+
_KAPT_OPTS=-Xplugin=${tool:"contrib/java/org/jetbrains/kotlin/kotlin-annotation-processing/2.0.21"} $KT_KAPT_PLUGIN_OPTS
10511051
_RUN_KAPT=${YMAKE_PYTHON} ${input:"build/scripts/with_kapt_args.py"} --ap-classpath ${KT_KAPT_AP_CLASSPATH} -- $COMPILE_KT $_KAPT_OPTS
10521052
_APPEND_KAPT_GENERATED_SRCS=$YMAKE_PYTHON3 ${input:"build/scripts/resolve_java_srcs.py"} -d $KT_KAPT_SOURCES_DIR --include-patterns '**/*.java' '**/*.kt' --resolve-kotlin --append -s ${BINDIR}/all-java.srclst -k $KT_SRCLIST -r ${BINDIR}/not-used.txt
10531053

@@ -1387,7 +1387,8 @@ when ($JDK_REAL_VERSION == "11") {
13871387
}
13881388

13891389
# tag:java-specific
1390-
JAVAC_OPTS=
1390+
JAVAC_CPU_COUNT=4
1391+
JAVAC_OPTS=-J-XX:ActiveProcessorCount=$JAVAC_CPU_COUNT
13911392
when ($USE_SYSTEM_JDK) {
13921393
JDK_RESOURCE=$USE_SYSTEM_JDK
13931394
}
@@ -1516,7 +1517,7 @@ elsewhen ($JDK_VERSION == "") {
15161517
otherwise {
15171518
EXTERNAL_JAVA_JDK_RESOURCE=$JDK_RESOURCE
15181519
}
1519-
COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/compile_java.py"} --ya-start-command-file --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET --srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME} $AUTO_INPUT DELIM $JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} --ya-end-command-file ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:2"} ${hide;input:"build/scripts/java_command_file.py"} ${hide;input:"build/scripts/process_command_files.py"}
1520+
COMPILE_JAVA=${cwd:ARCADIA_BUILD_ROOT} $YMAKE_PYTHON3 ${input:"build/scripts/compile_java.py"} --ya-start-command-file --java-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/java --javac-bin $EXTERNAL_JAVA_JDK_RESOURCE/bin/javac --jar-bin $JDK_RESOURCE/bin/jar --kotlin-compiler $KOTLIN_COMPILER_RESOURCE_GLOBAL/kotlin-compiler.jar $JAVA_VCS_MF_ARG $PACKAGE_PREFIX_ARGS --jar-output $TARGET --srcs-jar-output ${output;suf=-sources.jar:REALPRJNAME} $AUTO_INPUT DELIM $JAVAC_OPTS DELIM $MANAGED_PEERS_CLOSURE DELIM -no-stdlib -module-name $REALPRJNAME -jvm-target ${KOTLIN_JVM_TARGET} ${KOTLINC_OPTS_VALUE} --ya-end-command-file ${hide;kv:"p JV"} ${hide;kv:"pc light-blue"} ${hide;kv:"show_out"} ${hide;requirements:"cpu:4"} ${hide;input:"build/scripts/java_command_file.py"} ${hide;input:"build/scripts/process_command_files.py"}
15201521

15211522
ARGS_DELIM="MACRO_CALLS_DELIM"
15221523

@@ -1988,9 +1989,9 @@ macro WITH_KOTLINC_DETEKT(Options...) {
19881989

19891990
# tag:kotlin-specific
19901991
### Also search for _KAPT_OPTS and change version there
1991-
_KOTLIN_VERSION=1.9.24
1992-
KOTLIN_VERSION=1.9.24
1993-
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.24/ya.dependency_management.inc
1992+
_KOTLIN_VERSION=2.0.21
1993+
KOTLIN_VERSION=2.0.21
1994+
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/2.0.21/ya.dependency_management.inc
19941995
DETEKT_VERSION=1.23.7
19951996

19961997
_KOTLIN_SEM= \

‎build/conf/licenses.json

+1
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
"libtiff",
263263
"LicenseRef-scancode-ams-fonts",
264264
"LicenseRef-scancode-bitstream",
265+
"LicenseRef-scancode-happy-bunny",
265266
"LicenseRef-scancode-mit-no-advert-export-control",
266267
"LicenseRef-scancode-oasis-ws-security-spec",
267268
"LicenseRef-scancode-paul-mackerras-binary",

‎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-3
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ multimodule PY3_PROGRAM {
267267
# Notify pybuild to skip all python main function definitions
268268
ENABLE(IGNORE_PY_MAIN)
269269
NO_CLANG_TIDY()
270-
DISABLE(START_TARGET)
271270
}
272271
}
273272

@@ -436,7 +435,6 @@ multimodule PY3TEST {
436435
PEERDIR+=library/python/pytest
437436
_DONT_REQUIRE_LICENSE()
438437
WITHOUT_VERSION()
439-
DISABLE(START_TARGET)
440438
}
441439
}
442440

@@ -899,7 +897,7 @@ macro PYTHON3_ADDINCL() {
899897
macro _ARCADIA_PYTHON3_ADDINCL() {
900898
_PYTHON3_ADDINCL()
901899
SET(MODULE_TAG PY3)
902-
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)
903901
}
904902

905903
# tag:python-specific tag:internal

‎build/conf/settings.conf

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ USE_GLOBAL_CMD=yes
99
PIC_NO_PIE=no
1010
FAIL_PY2=no
1111
MAIN_OUTPUT_AS_EXTRA=yes
12-
DISABLE_ATD=yes
1312

1413
when ($OS_WINDOWS == "yes") {
1514
USE_GLOBAL_CMD=no

‎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/export_generators/cmake/cmake/conan_provider.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -349,23 +349,23 @@ macro(append_compiler_executables_configuration)
349349
set(_conan_rc_compiler "")
350350
set(_conan_compilers_list "")
351351
if(CMAKE_C_COMPILER)
352-
set(_conan_c_compiler "\"c\":\"\\\"${CMAKE_C_COMPILER}\\\"\"")
352+
set(_conan_c_compiler "\"c\":\"${CMAKE_C_COMPILER}\"")
353353
set_conan_compiler_if_appleclang(C cc _conan_c_compiler)
354354
list(APPEND _conan_compilers_list ${_conan_c_compiler})
355355
else()
356356
message(WARNING "CMake-Conan: The C compiler is not defined. "
357357
"Please define CMAKE_C_COMPILER or enable the C language.")
358358
endif()
359359
if(CMAKE_CXX_COMPILER)
360-
set(_conan_cpp_compiler "\"cpp\":\"\\\"${CMAKE_CXX_COMPILER}\\\"\"")
360+
set(_conan_cpp_compiler "\"cpp\":\"${CMAKE_CXX_COMPILER}\"")
361361
set_conan_compiler_if_appleclang(CXX c++ _conan_cpp_compiler)
362362
list(APPEND _conan_compilers_list ${_conan_cpp_compiler})
363363
else()
364364
message(WARNING "CMake-Conan: The C++ compiler is not defined. "
365365
"Please define CMAKE_CXX_COMPILER or enable the C++ language.")
366366
endif()
367367
if(CMAKE_RC_COMPILER)
368-
set(_conan_rc_compiler "\"rc\":\"\\\"${CMAKE_RC_COMPILER}\\\"\"")
368+
set(_conan_rc_compiler "\"rc\":\"${CMAKE_RC_COMPILER}\"")
369369
list(APPEND _conan_compilers_list ${_conan_rc_compiler})
370370
# Not necessary to warn if RC not defined
371371
endif()

‎build/external_resources/yexport/public.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:7688576117"
4+
"uri": "sbr:8188215274"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7688574511"
7+
"uri": "sbr:8188212965"
88
},
99
"linux": {
10-
"uri": "sbr:7688572842"
10+
"uri": "sbr:8188211019"
1111
}
1212
}
1313
}

‎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:7688485639"
4+
"uri": "sbr:8188103297"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:7688483801"
7+
"uri": "sbr:8188100853"
88
},
99
"linux": {
10-
"uri": "sbr:7688482250"
10+
"uri": "sbr:8188098624"
1111
}
1212
}
1313
}

0 commit comments

Comments
 (0)