-
Notifications
You must be signed in to change notification settings - Fork 567
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cs to stable 24 3 #9268
Cs to stable 24 3 #9268
Conversation
Conflicts: ydb/core/tx/columnshard/normalizer/abstract/abstract.h
This reverts commit ccf98e2.
Conflicts: ydb/core/tx/columnshard/engines/changes/compaction/merger.cpp ydb/core/tx/columnshard/engines/scheme/versions/abstract_scheme.cpp
Co-authored-by: Ivan Morozov <ivanmorozov@localhost.localdomain> Conflicts in canondata re-canonized
Conflicts: ydb/core/tx/columnshard/engines/changes/compaction/abstract/merger.cpp
…rm#7423) Conflicts: .github/config/muted_ya.txt
Conflicts: ydb/library/yql/sql/v1/sql_ut.cpp
Conflicts: ydb/core/protos/feature_flags.proto ydb/core/testlib/basics/feature_flags.h
Conflicts: ydb/core/tx/columnshard/normalizer/abstract/abstract.h
Conflicts: .github/config/muted_ya.txt
…ydb-platform#9002) Conflicts: ydb/core/protos/feature_flags.proto
⚪ |
⚪ |
⚪ |
⚪
|
⚪
🔴
*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation |
43977d4
into
ydb-platform:stable-24-3-9-cs
Co-authored-by: Semyon <yentsovsemyon@ydb.tech> Co-authored-by: ivanmorozov333 <ivanmorozov@ydb.tech> Co-authored-by: Ivan <5627721+abyss7@users.noreply.github.com> Co-authored-by: Artem Alekseev <fexolm@ydb.tech> Co-authored-by: Alexander Avdonkin <aavdonkin@yandex.ru> Co-authored-by: Nikita Vasilev <ns-vasilev@ydb.tech> Co-authored-by: Vladislav Gogov <vlad-gogov@ydb.tech> Conflicts: ydb/core/kqp/compute_actor/kqp_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_compute_actor.h ydb/core/kqp/compute_actor/kqp_compute_actor_factory.h ydb/core/kqp/compute_actor/kqp_compute_events.h ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.h ydb/core/kqp/executer_actor/kqp_data_executer.cpp ydb/core/kqp/executer_actor/kqp_planner.cpp ydb/core/kqp/executer_actor/kqp_planner.h ydb/core/kqp/node_service/kqp_node_service.cpp ydb/core/kqp/ut/common/kqp_ut_common.cpp ydb/core/kqp/ut/olap/clickbench_ut.cpp ydb/core/kqp/ut/olap/kqp_olap_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_common.h ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_mvcc_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_tx_ut.cpp ydb/core/protos/feature_flags.proto ydb/core/protos/kqp.proto ydb/core/testlib/basics/feature_flags.h ydb/core/tx/columnshard/engines/scheme/index_info.cpp ydb/core/tx/columnshard/splitter/chunks.h ydb/library/yql/sql/v1/sql_ut.cpp ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7
Co-authored-by: Semyon <yentsovsemyon@ydb.tech> Co-authored-by: ivanmorozov333 <ivanmorozov@ydb.tech> Co-authored-by: Ivan <5627721+abyss7@users.noreply.github.com> Co-authored-by: Artem Alekseev <fexolm@ydb.tech> Co-authored-by: Alexander Avdonkin <aavdonkin@yandex.ru> Co-authored-by: Nikita Vasilev <ns-vasilev@ydb.tech> Co-authored-by: Vladislav Gogov <vlad-gogov@ydb.tech> Conflicts: ydb/core/kqp/compute_actor/kqp_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_compute_actor.h ydb/core/kqp/compute_actor/kqp_compute_actor_factory.h ydb/core/kqp/compute_actor/kqp_compute_events.h ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.h ydb/core/kqp/executer_actor/kqp_data_executer.cpp ydb/core/kqp/executer_actor/kqp_planner.cpp ydb/core/kqp/executer_actor/kqp_planner.h ydb/core/kqp/node_service/kqp_node_service.cpp ydb/core/kqp/ut/common/kqp_ut_common.cpp ydb/core/kqp/ut/olap/clickbench_ut.cpp ydb/core/kqp/ut/olap/kqp_olap_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_common.h ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_mvcc_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_tx_ut.cpp ydb/core/protos/feature_flags.proto ydb/core/protos/kqp.proto ydb/core/testlib/basics/feature_flags.h ydb/core/tx/columnshard/engines/scheme/index_info.cpp ydb/core/tx/columnshard/splitter/chunks.h ydb/library/yql/sql/v1/sql_ut.cpp ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7
Co-authored-by: Semyon <yentsovsemyon@ydb.tech> Co-authored-by: ivanmorozov333 <ivanmorozov@ydb.tech> Co-authored-by: Ivan <5627721+abyss7@users.noreply.github.com> Co-authored-by: Artem Alekseev <fexolm@ydb.tech> Co-authored-by: Alexander Avdonkin <aavdonkin@yandex.ru> Co-authored-by: Nikita Vasilev <ns-vasilev@ydb.tech> Co-authored-by: Vladislav Gogov <vlad-gogov@ydb.tech> Conflicts: ydb/core/kqp/compute_actor/kqp_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_compute_actor.h ydb/core/kqp/compute_actor/kqp_compute_actor_factory.h ydb/core/kqp/compute_actor/kqp_compute_events.h ydb/core/kqp/compute_actor/kqp_scan_compute_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.cpp ydb/core/kqp/compute_actor/kqp_scan_fetcher_actor.h ydb/core/kqp/executer_actor/kqp_data_executer.cpp ydb/core/kqp/executer_actor/kqp_planner.cpp ydb/core/kqp/executer_actor/kqp_planner.h ydb/core/kqp/node_service/kqp_node_service.cpp ydb/core/kqp/ut/common/kqp_ut_common.cpp ydb/core/kqp/ut/olap/clickbench_ut.cpp ydb/core/kqp/ut/olap/kqp_olap_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_common.h ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_mvcc_ut.cpp ydb/core/kqp/ut/tx/kqp_sink_tx_ut.cpp ydb/core/protos/feature_flags.proto ydb/core/protos/kqp.proto ydb/core/testlib/basics/feature_flags.h ydb/core/tx/columnshard/engines/scheme/index_info.cpp ydb/core/tx/columnshard/splitter/chunks.h ydb/library/yql/sql/v1/sql_ut.cpp ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 Fix tx tests (ydb-platform#8945) (ydb-platform#9284) Co-authored-by: Nikita Vasilev <ns-vasilev@ydb.tech> fix tests
Co-authored-by: Semyon <yentsovsemyon@ydb.tech> Co-authored-by: ivanmorozov333 <ivanmorozov@ydb.tech> Co-authored-by: Ivan <5627721+abyss7@users.noreply.github.com> Co-authored-by: Artem Alekseev <fexolm@ydb.tech> Co-authored-by: Alexander Avdonkin <aavdonkin@yandex.ru> Co-authored-by: Nikita Vasilev <ns-vasilev@ydb.tech> Co-authored-by: Vladislav Gogov <vlad-gogov@ydb.tech>
Co-authored-by: Semyon <yentsovsemyon@ydb.tech> Co-authored-by: ivanmorozov333 <ivanmorozov@ydb.tech> Co-authored-by: Ivan <5627721+abyss7@users.noreply.github.com> Co-authored-by: Artem Alekseev <fexolm@ydb.tech> Co-authored-by: Alexander Avdonkin <aavdonkin@yandex.ru> Co-authored-by: Nikita Vasilev <ns-vasilev@ydb.tech> Co-authored-by: Vladislav Gogov <vlad-gogov@ydb.tech>
No description provided.