Skip to content

Commit 51d51b4

Browse files
zverevgenyzverevgeny
committed
Merge stable-analytics-25-1-6 ('f1686eb') into stable-25-1
Conflicts: .github/config/muted_ya.txt CHANGELOG.md ydb/apps/ydb/CHANGELOG.md ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_broker.cpp ydb/core/cms/console/console_configs_provider.h ydb/core/kafka_proxy/ut/actors_ut.cpp ydb/core/kqp/common/kqp_tx_manager.cpp ydb/core/kqp/compile_service/kqp_compile_actor.cpp ydb/core/kqp/compile_service/kqp_compile_service.cpp ydb/core/kqp/executer_actor/kqp_executer_impl.h ydb/core/kqp/executer_actor/kqp_executer_stats.cpp ydb/core/kqp/opt/kqp_opt_kql.cpp ydb/core/kqp/opt/logical/kqp_opt_log_indexes.cpp ydb/core/kqp/runtime/kqp_stream_lookup_actor.cpp ydb/core/kqp/runtime/kqp_write_actor.cpp ydb/core/kqp/runtime/kqp_write_table.cpp ydb/core/kqp/session_actor/kqp_query_state.h ydb/core/kqp/session_actor/kqp_session_actor.cpp ydb/core/kqp/ut/data_integrity/kqp_data_integrity_trails_ut.cpp ydb/core/kqp/ut/effects/kqp_effects_ut.cpp ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp ydb/core/kqp/ut/opt/kqp_ne_ut.cpp ydb/core/kqp/ut/query/kqp_query_ut.cpp ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp ydb/core/kqp/ut/spilling/kqp_scan_spilling_ut.cpp ydb/core/mind/bscontroller/console_interaction.cpp ydb/core/protos/feature_flags.proto ydb/core/protos/index_builder.proto ydb/core/protos/table_service_config.proto ydb/core/protos/tx_datashard.proto ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/merge.cpp ydb/core/tx/columnshard/engines/storage/granule/granule.cpp ydb/core/tx/columnshard/test_helper/columnshard_ut_common.cpp ydb/core/tx/columnshard/ut_schema/ut_columnshard_schema.cpp ydb/core/tx/datashard/kmeans_helper.cpp ydb/core/tx/datashard/kmeans_helper.h ydb/core/tx/datashard/upload_stats.h ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp ydb/core/tx/schemeshard/schemeshard_impl.cpp ydb/core/tx/schemeshard/schemeshard_impl.h ydb/core/tx/schemeshard/schemeshard_info_types.h ydb/core/tx/schemeshard/schemeshard_utils.cpp ydb/core/tx/schemeshard/schemeshard_utils.h ydb/core/tx/schemeshard/ut_base/ut_base.cpp ydb/core/tx/schemeshard/ut_restore/ut_restore.cpp ydb/core/tx/tx_proxy/upload_rows_common_impl.h ydb/core/viewer/tests/test.py ydb/core/viewer/viewer_describe.h ydb/services/persqueue_v1/actors/partition_actor.cpp ydb/tests/functional/compatibility/test_compatibility.py ydb/tests/functional/compatibility/test_stress.py ydb/tests/functional/compatibility/ya.make ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_13.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_10.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_11.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_12.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_9.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_1.plan ydb/tests/library/harness/kikimr_config.py
2 parents 527e9d0 + f1686eb commit 51d51b4

File tree

1,363 files changed

+43838
-16519
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,363 files changed

+43838
-16519
lines changed

‎.github/config/muted_ya.txt

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,13 @@ ydb/core/keyvalue/ut_trace TKeyValueTracingTest.WriteSmall
2020
ydb/core/kqp/ut/cost KqpCost.OlapWriteRow
2121
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestAggregation
2222
ydb/core/kqp/ut/olap KqpDecimalColumnShard.TestFilterCompare
23-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_1
24-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_1_clean
25-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_1_clean_with_restarts
26-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_3_1
27-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit1_3_2_1_clean
28-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.BlobsSharingSplit3_1
29-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.ChangeSchemaAndSplit
30-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.HugeSchemeHistory
31-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleMerge
32-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleMergesWithRestartsAfterWait
33-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleMergesWithRestartsWhenWait
34-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSchemaVersions
35-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplits
36-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplitsThenMerges
37-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplitsWithRestartsAfterWait
38-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.MultipleSplitsWithRestartsWhenWait
39-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.TableReshardingConsistency64
40-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.TableReshardingModuloN
41-
ydb/core/kqp/ut/olap KqpOlapBlobsSharing.UpsertWhileSplitTest
4223
ydb/core/kqp/ut/olap KqpOlapSysView.StatsSysViewBytesColumnActualization
4324
ydb/core/kqp/ut/olap KqpOlapSysView.StatsSysViewBytesDictActualization
4425
ydb/core/kqp/ut/olap KqpOlapSysView.StatsSysViewBytesDictStatActualization
4526
ydb/core/kqp/ut/olap KqpOlapWrite.TierDraftsGCWithRestart
4627
ydb/core/kqp/ut/olap [*/*] chunk chunk
4728
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable+ColumnStore
4829
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable-ColumnStore
49-
ydb/core/kqp/ut/query KqpLimits.StreamWrite+Allowed
50-
ydb/core/kqp/ut/query KqpStats.DeferredEffects+UseSink
5130
ydb/core/kqp/ut/query KqpStats.SysViewClientLost
5231
ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns
5332
ydb/core/kqp/ut/scheme KqpScheme.AlterAsyncReplication
@@ -98,7 +77,6 @@ ydb/services/ydb/ut YdbLogStore.AlterLogTable
9877
ydb/tests/fq/control_plane_storage [*/*] chunk chunk
9978
ydb/tests/fq/control_plane_storage [*/*]+chunk+chunk
10079
ydb/tests/fq/generic/analytics sole chunk chunk
101-
ydb/tests/fq/generic/analytics test_join.py.TestJoinAnalytics.test_simple[v1-fq_client0-mvp_external_ydb_endpoint0]
10280
ydb/tests/fq/generic/analytics test_join.py.TestJoinAnalytics.test_simple[v2-fq_client0-mvp_external_ydb_endpoint0]
10381
ydb/tests/fq/generic/streaming sole chunk chunk
10482
ydb/tests/fq/mem_alloc sole chunk chunk
@@ -120,17 +98,6 @@ ydb/tests/fq/yds test_mem_alloc.py.TestMemAlloc.test_join_alloc[v1]
12098
ydb/tests/fq/yds test_recovery.py.TestRecovery.test_ic_disconnection
12199
ydb/tests/fq/yds test_select_limit_db_id.py.TestSelectLimitWithDbId.test_select_same_with_id[v1-mvp_external_ydb_endpoint0]
122100
ydb/tests/fq/yds test_yds_bindings.py.TestBindings.test_yds_insert[v1]
123-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_export[current_to_current]
124-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_export[current_to_stable_24_4]
125-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_export[stable_24_4_to_current]
126-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_export[stable_24_4_to_current_mixed]
127-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_tpch1[current_to_current-column]
128-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_tpch1[current_to_current-row]
129-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_tpch1[current_to_stable_24_4-column]
130-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_tpch1[stable_24_4_to_current-column]
131-
ydb/tests/functional/compatibility test_compatibility.py.TestCompatibility.test_tpch1[stable_24_4_to_current_mixed-column]
132-
ydb/tests/functional/compatibility test_stress.py.TestStress.test_log[current-row]
133-
ydb/tests/functional/compatibility test_stress.py.TestStress.test_log[mixed-row]
134101
ydb/tests/functional/hive test_drain.py.TestHive.test_drain_on_stop
135102
ydb/tests/functional/rename [test_rename.py */*] chunk chunk
136103
ydb/tests/functional/serializable sole chunk chunk

‎ydb/core/actorlib_impl/ut/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PEERDIR(
1818
library/cpp/svnversion
1919
ydb/core/testlib/actors
2020
ydb/core/testlib/basics/default
21-
yql/essentials/minikql/comp_nodes/llvm14
21+
yql/essentials/minikql/comp_nodes/llvm16
2222
)
2323

2424
SRCS(

‎ydb/core/backup/common/backup_restore_traits.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "backup_restore_traits.h"
22

3-
#include <ydb/core/protos/flat_scheme_op.pb.h>
43
#include <ydb/library/yverify_stream/yverify_stream.h>
54

65
#include <util/generic/hash.h>

‎ydb/core/backup/s3/export_s3_uploader.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "extstorage_usage_config.h"
88

99
#include <ydb/core/base/appdata.h>
10-
#include <ydb/core/protos/flat_scheme_op.pb.h>
1110
#include <ydb/library/services/services.pb.h>
1211
#include <ydb/core/wrappers/s3_storage_config.h>
1312
#include <ydb/core/wrappers/s3_wrapper.h>

‎ydb/core/backup/s3/extstorage_usage_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "backup_restore_traits.h"
66

77
#include <ydb/core/base/events.h>
8-
#include <ydb/core/protos/flat_scheme_op.pb.h>
98
#include <ydb/public/api/protos/ydb_export.pb.h>
109

1110
#include <contrib/libs/aws-sdk-cpp/aws-cpp-sdk-s3/include/aws/s3/model/StorageClass.h>

‎ydb/core/base/appdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "resource_profile.h"
1111
#include "event_filter.h"
1212

13-
#include <ydb/core/control/immediate_control_board_impl.h>
13+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
1414
#include <ydb/core/grpc_services/grpc_helper.h>
1515
#include <ydb/core/jaeger_tracing/sampling_throttling_configurator.h>
1616
#include <ydb/core/tablet_flat/shared_cache_pages.h>

‎ydb/core/base/appdata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "resource_profile.h"
2929
#include "event_filter.h"
3030

31-
#include <ydb/core/control/immediate_control_board_impl.h>
31+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
3232
#include <ydb/library/pdisk_io/aio.h>
3333

3434
#include <ydb/core/base/event_filter.h>

‎ydb/core/base/events.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ struct TKikimrEvents : TEvents {
184184
ES_INCREMENTAL_RESTORE_SCAN = 4261,
185185
ES_FEATURE_FLAGS = 4262,
186186
ES_PRIORITY_QUEUE = 4263,
187+
ES_SOLOMON_PROVIDER = 4264,
187188
};
188189
};
189190

‎ydb/core/base/ut_board_subscriber/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PEERDIR(
1111
ydb/core/testlib/basics
1212
ydb/core/base
1313
ydb/core/testlib/basics/default
14-
yql/essentials/minikql/comp_nodes/llvm14
14+
yql/essentials/minikql/comp_nodes/llvm16
1515
)
1616

1717
YQL_LAST_ABI_VERSION()

‎ydb/core/blobstorage/common/immediate_control_defaults.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "defs.h"
4-
#include <ydb/core/control/immediate_control_board_wrapper.h>
4+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
55

66
namespace NKikimr {
77

0 commit comments

Comments
 (0)