Skip to content

Commit 21dcc1f

Browse files
authored
Merge branch 'main' into cursor/kafka-listen-address-af67
2 parents 0153ed4 + d1e5156 commit 21dcc1f

305 files changed

Lines changed: 5692 additions & 7919 deletions

File tree

Some content is hidden

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

.github/config/muted_ya.txt

Lines changed: 4 additions & 108 deletions
Large diffs are not rendered by default.

.github/config/muted_ya_asan.txt

Lines changed: 26 additions & 28 deletions
Large diffs are not rendered by default.

.github/config/muted_ya_msan.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ ydb/library/actors/interconnect/ut Interconnect.RdmaXdcCatchReplayAfterPartialPa
4242
ydb/library/actors/interconnect/ut Interconnect.RdmaXdcCatchReplayAfterPartialRdmaRead
4343
ydb/library/actors/interconnect/ut Interconnect.RdmaXdcCatchReplayAfterPartialRdmaReadOnPeerSocketClose
4444
ydb/library/actors/interconnect/ut Interconnect.SetupRdmaSession
45-
ydb/tests/compatibility/common test_compatibility.py.TestCompatibility.test_simple[restart_prestable-26-3_to_stable-26-2-1-row]
4645
ydb/tests/compatibility/common test_data_type.py.TestDataType.test_data_type[restart_prestable-26-3_to_prestable-26-3-COLUMN]
4746
ydb/tests/compatibility/common test_data_type.py.TestDataType.test_data_type[restart_prestable-26-3_to_prestable-26-3-ROW]
4847
ydb/tests/compatibility/common test_data_type.py.TestDataType.test_parametrized_data_type[restart_prestable-26-3_to_prestable-26-3-COLUMN]
@@ -278,6 +277,7 @@ ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRestartToAnothe
278277
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRestartToAnotherVersion.test_restart_to_another_version[restart_stable-26-3-1_to_stable-26-2-1-True]
279278
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRollingUpgradeAndDowngrade.test_rolling_upgrade[rolling_stable-26-2-1_to_prestable-26-3-True]
280279
ydb/tests/compatibility/udf test_datetime2.py.TestDatetime2.test_all[mixed_prestable-26-3_and_stable-26-2-1]
280+
ydb/tests/compatibility/udf test_datetime2.py.TestDatetime2.test_all[mixed_prestable-26-4_and_stable-26-3-1]
281281
ydb/tests/compatibility/udf test_datetime2.py.TestDatetime2.test_all[mixed_stable-26-3-1_and_stable-26-2-1]
282282
ydb/tests/functional/audit test_canonical_records.py.test_dstool_evict_vdisk_grpc
283283
ydb/tests/functional/nbs py3test.sole chunk

.github/config/muted_ya_tsan.txt

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ ydb/core/kqp/executer_actor/ut unittest.sole chunk
8686
ydb/core/kqp/rm_service/ut KqpRm.ConcurrentChannels
8787
ydb/core/kqp/rm_service/ut KqpRm.ConcurrentTasks
8888
ydb/core/kqp/ut/arrow unittest.[*/*] chunk
89+
ydb/core/kqp/ut/indexes/fulltext unittest.[*/*] chunk
8990
ydb/core/kqp/ut/opt KqpNamedExpressions.NamedExpressionRandomUpsertRevert+UseDataQuery-EnableIndexStreamWrite
9091
ydb/core/kqp/ut/opt unittest.[*/*] chunk
9192
ydb/core/kqp/ut/query KqpAnalyze.AnalyzeTable+ColumnStore
@@ -96,14 +97,14 @@ ydb/core/kqp/ut/query KqpLimits.OutOfSpaceYQLUpsertFail
9697
ydb/core/kqp/ut/query unittest.[*/*] chunk
9798
ydb/core/kqp/ut/rbo KqpRboOlap.DoubleOutOfRangeInJson
9899
ydb/core/kqp/ut/rbo KqpRboYql.Aggregation-ColumnStore
99-
ydb/core/kqp/ut/rbo KqpRboYql.ColumnStatistics-ColumnStore
100100
ydb/core/kqp/ut/rbo KqpRboYql.TPCDS_YQL
101101
ydb/core/kqp/ut/rbo unittest.[*/*] chunk
102102
ydb/core/kqp/ut/runtime KqpScanLogs.GraceJoin-EnabledLogs
103103
ydb/core/kqp/ut/runtime unittest.[*/*] chunk
104104
ydb/core/kqp/ut/scheme KqpScheme.BuildingUniqIndexAllowsTableModificationsPublicApi+EnableIndexStreamWrite
105105
ydb/core/kqp/ut/scheme KqpScheme.BuildingUniqIndexAllowsTableModificationsPublicApi-EnableIndexStreamWrite
106106
ydb/core/kqp/ut/scheme KqpScheme.BuildingUniqIndexAllowsTableModificationsSql+EnableIndexStreamWrite
107+
ydb/core/kqp/ut/scheme KqpScheme.BuildingUniqIndexAllowsTableModificationsSql-EnableIndexStreamWrite
107108
ydb/core/kqp/ut/scheme unittest.[*/*] chunk
108109
ydb/core/kqp/ut/service KqpQueryService.FlowControllOnHugeRealTable-LongRow
109110
ydb/core/kqp/ut/service unittest.[*/*] chunk
@@ -125,8 +126,6 @@ ydb/core/nbs/cloud/blockstore/libs/storage/partition_direct/ut TVChunkTest.Shoul
125126
ydb/core/nbs/cloud/blockstore/libs/storage/partition_direct/ut TVChunkTest.ShouldSwitchHostToTemporaryOfflineAndBack
126127
ydb/core/nbs/cloud/blockstore/libs/vhost/ut TServerTest.ShouldCancelRequestsInFlightWhenStopEndpointOrStopServer
127128
ydb/core/persqueue/pqtablet/partition/mlp/ut TMLPConsumerFIFOWithSplitDedup.Dedup_DoubleSplit_3min
128-
ydb/core/persqueue/pqtablet/partition/mlp/ut TMLPConsumerFIFOWithSplitDedup.Dedup_TripleSplit
129-
ydb/core/persqueue/public/describer/ut TDescriberTests.TopicNotCanonizedPath
130129
ydb/core/persqueue/public/describer/ut TDescriberTests.TopicWithoutDatabase
131130
ydb/core/persqueue/public/describer/ut unittest.sole chunk
132131
ydb/core/statistics/service/ut ColumnStatistics.ManyColumns
@@ -159,7 +158,6 @@ ydb/core/transfer/ut/column_table Transfer_ColumnTable.Upsert_OneBatch
159158
ydb/core/transfer/ut/column_table unittest.sole chunk
160159
ydb/core/transfer/ut/functional Transfer.CheckCommittedOffsetEmptyBatch_Local
161160
ydb/core/transfer/ut/functional Transfer.CheckCommittedOffsetEmptyBatch_Remote
162-
ydb/core/transfer/ut/functional Transfer.CreateTransferTargetIsNotTable
163161
ydb/core/transfer/ut/functional Transfer.DropTransfer
164162
ydb/core/transfer/ut/functional Transfer.LocalTopic_BigMessage
165163
ydb/core/transfer/ut/functional unittest.sole chunk
@@ -169,6 +167,8 @@ ydb/core/transfer/ut/transfer_metrics unittest.sole chunk
169167
ydb/core/tx/columnshard/backup/iscan/ut IScan.MultiExport
170168
ydb/core/tx/columnshard/backup/iscan/ut IScan.ShouldRejectParquetExportWithEncryption
171169
ydb/core/tx/columnshard/backup/iscan/ut IScan.UploaderExport
170+
ydb/core/tx/schemeshard/ut_set_column_constraint SetNotNullTest.CancelAtLockingStage
171+
ydb/core/tx/schemeshard/ut_set_column_constraint unittest.[*/*] chunk
172172
ydb/core/tx/tx_proxy/ut_storage_tenant TStorageTenantTest.RemoveStoragePoolBeforeDroppingTablet
173173
ydb/tests/compatibility/common test_compatibility.py.TestCompatibility.test_simple[restart_prestable-26-3_to_stable-26-2-1-row]
174174
ydb/tests/compatibility/common test_compatibility.py.TestCompatibility.test_simple[restart_stable-26-2-1_to_prestable-26-3-row]
@@ -198,6 +198,7 @@ ydb/tests/compatibility/indexes test_bloom_filter_index.py.TestBloomFilterIndex.
198198
ydb/tests/compatibility/indexes test_vector_index.py.TestVectorIndex.test_vector_index[rolling_stable-26-1-1_to_stable-26-2-1]
199199
ydb/tests/compatibility/indexes test_vector_index.py.TestVectorIndex.test_vector_index[rolling_stable-26-2-1_to_prestable-26-3]
200200
ydb/tests/compatibility/olap test_encoding.py.TestEncoding.test_encoding[rolling_stable-26-2-1_to_prestable-26-3]
201+
ydb/tests/compatibility/olap test_encoding.py.TestEncoding.test_encoding[rolling_stable-26-2-1_to_stable-26-3-1]
201202
ydb/tests/compatibility/result_set_format py3test.[test_result_set_arrow.py */*] chunk
202203
ydb/tests/compatibility/result_set_format test_result_set_arrow.py.TestResultSetArrow.test_column_alias[restart_prestable-26-3_to_prestable-26-3-COLUMN]
203204
ydb/tests/compatibility/result_set_format test_result_set_arrow.py.TestResultSetArrow.test_column_alias[restart_prestable-26-3_to_stable-26-2-1-COLUMN]
@@ -403,13 +404,11 @@ ydb/tests/compatibility/result_set_format test_result_set_value.py.TestResultSet
403404
ydb/tests/compatibility/result_set_format test_result_set_value.py.TestResultSetValue.test_schema_inclusion_mode[restart_stable-26-3-1_to_stable-26-3-1-1-8388608-COLUMN]
404405
ydb/tests/compatibility/result_set_format test_result_set_value.py.TestResultSetValue.test_schema_inclusion_mode[restart_stable-26-3-1_to_stable-26-3-1-2-2048-COLUMN]
405406
ydb/tests/compatibility/result_set_format test_result_set_value.py.TestResultSetValue.test_schema_inclusion_mode[restart_stable-26-3-1_to_stable-26-3-1-2-8388608-COLUMN]
406-
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingMixedCluster.test_mixed_cluster[mixed_prestable-26-3_and_stable-26-2-1-False]
407407
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRestartToAnotherVersion.test_restart_to_another_version[restart_prestable-26-3_to_stable-26-2-1-False]
408408
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRestartToAnotherVersion.test_restart_to_another_version[restart_prestable-26-3_to_stable-26-2-1-True]
409409
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRestartToAnotherVersion.test_restart_to_another_version[restart_stable-26-3-1_to_stable-26-2-1-False]
410410
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRestartToAnotherVersion.test_restart_to_another_version[restart_stable-26-3-1_to_stable-26-2-1-True]
411411
ydb/tests/compatibility/streaming test_streaming.py.TestStreamingRollingUpgradeAndDowngrade.test_rolling_upgrade[rolling_stable-26-2-1_to_prestable-26-3-False]
412-
ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicMixedClusterFixture.test_workload[mixed_prestable-26-3_and_stable-26-2-1]
413412
ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicRestartToAnotherVersion.test_workload[restart_prestable-26-3_to_prestable-26-3]
414413
ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicRestartToAnotherVersion.test_workload[restart_prestable-26-3_to_stable-26-2-1]
415414
ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicRestartToAnotherVersion.test_workload[restart_prestable-26-4_to_prestable-26-4]
@@ -423,6 +422,7 @@ ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicRestartToAnothe
423422
ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicRestartToAnotherVersion.test_workload[restart_stable-26-3-1_to_stable-26-2-1]
424423
ydb/tests/compatibility/topics test_kafka_topic.py.TestKafkaTopicRestartToAnotherVersion.test_workload[restart_stable-26-3-1_to_stable-26-3-1]
425424
ydb/tests/compatibility/udf test_datetime2.py.TestDatetime2.test_all[mixed_prestable-26-3_and_stable-26-2-1]
425+
ydb/tests/compatibility/udf test_datetime2.py.TestDatetime2.test_all[mixed_prestable-26-4_and_stable-26-3-1]
426426
ydb/tests/compatibility/udf test_datetime2.py.TestDatetime2.test_all[mixed_stable-26-3-1_and_stable-26-2-1]
427427
ydb/tests/fq/http_api py3test.sole chunk
428428
ydb/tests/fq/http_api test_http_api.py.TestHttpApi.test_complex_results
@@ -463,6 +463,7 @@ ydb/tests/functional/replication Replication.TopicAutopartitioning
463463
ydb/tests/functional/replication unittest.sole chunk
464464
ydb/tests/functional/serverless test_serverless.py.test_discovery_exclusive_nodes[enable_alter_database_create_hive_first--false-enable_pool_encryption--false]
465465
ydb/tests/functional/serverless test_serverless.py.test_discovery_exclusive_nodes[enable_alter_database_create_hive_first--false-enable_pool_encryption--true]
466+
ydb/tests/functional/serverless test_serverless.py.test_discovery_exclusive_nodes[enable_alter_database_create_hive_first--true-enable_pool_encryption--false]
466467
ydb/tests/functional/serverless test_serverless.py.test_discovery_exclusive_nodes[enable_alter_database_create_hive_first--true-enable_pool_encryption--true]
467468
ydb/tests/functional/statistics py3test.[test_analyze.py */*] chunk
468469
ydb/tests/functional/statistics test_analyze.py.test_basic
@@ -1094,13 +1095,6 @@ ydb/tests/functional/tpc/medium/tpch test_s_float.py.TestTpchS0_5.test_tpch[8]
10941095
ydb/tests/functional/tpc/medium/tpch test_s_float.py.TestTpchS0_5.test_tpch[9]
10951096
ydb/tests/olap/column_compression/alter alter_compression.py.TestAlterColumnCompression.test_alter_to_compression[zstd_20_compression-algorithm=zstd,level=20]
10961097
ydb/tests/olap/column_compression/alter alter_compression.py.TestAlterColumnCompression.test_alter_zstd_level_from_0_to_19_compression
1097-
ydb/tests/olap/column_compression/create set_compression.py.TestCreateWithColumnCompression.test_add_with_compression[zstd_12_compression-algorithm=zstd,level=12-2]
1098-
ydb/tests/olap/column_compression/create set_compression.py.TestCreateWithColumnCompression.test_add_with_compression[zstd_17_compression-algorithm=zstd,level=17-2]
1099-
ydb/tests/olap/column_compression/create set_compression.py.TestCreateWithColumnCompression.test_add_with_compression[zstd_2_compression-algorithm=zstd,level=2-2]
1100-
ydb/tests/olap/column_compression/create set_compression.py.TestCreateWithColumnCompression.test_add_with_compression[zstd_7_compression-algorithm=zstd,level=7-2]
1101-
ydb/tests/olap/column_compression/create set_compression.py.TestCreateWithColumnCompression.test_create_with_compression[lz4_compression-algorithm=lz4-1]
1102-
ydb/tests/olap/min_max_index test_min_max_index.py.TestYdbMinMaxIndex.test_minmax_index_unsupported_type[JsonDocument-json_document]
1103-
ydb/tests/olap/scenario test_alter_tiering.py.TestAlterTiering.test_multi[many_tables]
11041098
ydb/tests/olap/scenario test_insert.py.TestInsert.test_multi[read_data_during_bulk_upsert]
11051099
ydb/tests/stress/backup/tests test_workload.py.TestYdbBackupWorkload.test
11061100
ydb/tests/stress/cdc/tests test_workload.py.TestYdbWorkload.test
@@ -1151,4 +1145,3 @@ ydb/tests/stress/transfer/tests test_workload.py.TestYdbWorkload.test[row-local]
11511145
ydb/tests/stress/transfer/tests test_workload.py.TestYdbWorkload.test[row-remote]
11521146
ydb/tests/stress/vector_workload/tests py3test.sole chunk
11531147
ydb/tests/stress/vector_workload/tests test_workload.py.TestYdbVectorWorkload.test
1154-
ydb/tools/mnc/viewer/ut py3test.sole chunk

ydb/apps/dstool/lib/common.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import ydb.core.protos.msgbus_pb2 as kikimr_msgbus
2424
import ydb.core.protos.blobstorage_config_pb2 as kikimr_bsconfig
2525
import ydb.core.protos.blobstorage_base3_pb2 as kikimr_bs3
26+
import ydb.core.protos.whiteboard_disk_states_pb2 as whiteboard_disk_states
2627
import ydb.core.protos.cms_pb2 as kikimr_cms
2728
import ydb.public.api.protos.draft.ydb_bridge_pb2 as ydb_bridge
2829
from ydb.public.api.grpc.draft import ydb_bridge_v1_pb2_grpc as bridge_grpc_server
@@ -1239,25 +1240,24 @@ def get_vslots_by_vdisk_ids(base_config, vdisk_ids):
12391240
return res
12401241

12411242

1243+
def vdisk_is_ok(vslot):
1244+
metrics = vslot.VDiskMetrics
1245+
return metrics.Replicated and metrics.State == whiteboard_disk_states.EVDiskState.OK
1246+
1247+
12421248
def filter_healthy_groups(groups, base_config, vslot_map):
1243-
res = {
1244-
group.GroupId: len(group.VSlotId)
1245-
for group in base_config.Group
1246-
if group.GroupId in groups
1247-
if all(vslot.Status == 'READY' for vslot in vslots_of_group(group, vslot_map))
1248-
}
1249-
check_set = {
1250-
(*vslot_id, *attrgetter('GroupId', 'FailRealmIdx', 'FailDomainIdx', 'VDiskIdx')(vslot))
1251-
for vslot_id, vslot in vslot_map.items()
1252-
if vslot.GroupId in res
1253-
}
1254-
for vdisk_id, j in fetch_json_info('vdiskinfo', {node_id for node_id, _, _, _, _, _, _ in check_set}).items():
1255-
if j.get('Replicated') and j.get('VDiskState') == 'OK':
1256-
check_item = *vdisk_id, *itemgetter('GroupID', 'Ring', 'Domain', 'VDisk')(j['VDiskId'])
1257-
if check_item in check_set:
1258-
check_set.remove(check_item)
1259-
res[j['VDiskId']['GroupID']] -= 1
1260-
return {group_id for group_id, count in res.items() if not count}
1249+
healthy = set()
1250+
for group in base_config.Group:
1251+
if group.GroupId not in groups:
1252+
continue
1253+
vslots = list(vslots_of_group(group, vslot_map))
1254+
if not vslots:
1255+
continue
1256+
if not all(vslot.Status == 'READY' for vslot in vslots):
1257+
continue
1258+
if all(vdisk_is_ok(vslot) for vslot in vslots):
1259+
healthy.add(group.GroupId)
1260+
return healthy
12611261

12621262

12631263
def add_host_access_options(parser):

ydb/apps/ydb/experimental/ydb/commands/ydb_service_experimental.cpp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <ydb/public/lib/ydb_cli/commands/ydb_common.h>
1111
#include <ydb/public/lib/ydb_cli/commands/ydb_service_topic.h>
12+
#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/query/client.h>
1213
#include <ydb/public/lib/yson_value/ydb_yson_value.h>
1314
#include <ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/proto/accessor.h>
1415

@@ -39,6 +40,7 @@ TCommandExperimental::TCommandExperimental()
3940
AddCommand(std::make_unique<TCommandJson2Svg>());
4041
AddCommand(std::make_unique<TCommandSqlExperimental>());
4142
AddCommand(std::make_unique<TCommandSqlOperation>());
43+
AddCommand(std::make_unique<TCommandDeleteSession>());
4244
}
4345

4446
TCommandStreamQuery::TCommandStreamQuery()
@@ -201,6 +203,34 @@ int TCommandGetConnection::Run(TConfig& config) {
201203
return EXIT_SUCCESS;
202204
}
203205

206+
TCommandDeleteSession::TCommandDeleteSession()
207+
: TYdbSimpleCommand("delete-session", {}, "Delete query session")
208+
{
209+
}
210+
211+
void TCommandDeleteSession::Config(TConfig& config) {
212+
TYdbSimpleCommand::Config(config);
213+
214+
config.SetFreeArgsNum(0);
215+
216+
config.Opts->AddLongOption("id", "Session ID to delete")
217+
.Required()
218+
.RequiredArgument("ID")
219+
.StoreResult(&SessionId);
220+
}
221+
222+
int TCommandDeleteSession::Run(TConfig& config) {
223+
auto driver = CreateDriver(config);
224+
NQuery::TQueryClient queryClient(driver);
225+
NStatusHelpers::ThrowOnErrorOrPrintIssues(
226+
queryClient.DeleteSession(
227+
SessionId,
228+
FillSettings(NQuery::TDeleteSessionSettings())
229+
).GetValueSync()
230+
);
231+
return EXIT_SUCCESS;
232+
}
233+
204234
namespace NExperimentalConsoleClient {
205235

206236
TCommandExplain::TCommandExplain()

ydb/apps/ydb/experimental/ydb/commands/ydb_service_experimental.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,16 @@ class TCommandGetConnection : public TClientCommand {
829829
virtual int Run(TConfig& config) override;
830830
};
831831

832+
class TCommandDeleteSession : public TYdbSimpleCommand {
833+
public:
834+
TCommandDeleteSession();
835+
virtual void Config(TConfig& config) override;
836+
virtual int Run(TConfig& config) override;
837+
838+
private:
839+
TString SessionId;
840+
};
841+
832842
// Avoid class name collision with public client
833843
namespace NExperimentalConsoleClient {
834844

ydb/core/engine/minikql/minikql_engine_host.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#include <library/cpp/containers/stack_vector/stack_vec.h>
1313

14+
#include <new>
15+
1416
namespace NKikimr {
1517
namespace NMiniKQL {
1618

@@ -310,10 +312,14 @@ class TSelectRangeLazyRow : public TComputationValue<TSelectRangeLazyRow<TTableI
310312

311313
void* operator new(size_t sz) = delete;
312314
void* operator new[](size_t sz) = delete;
313-
void operator delete(void *mem, std::size_t sz) {
314-
auto ptr = (TSelectRangeLazyRow*)mem;
315-
auto extraSize = ptr->Size() * sizeof(NUdf::TUnboxedValue) + ptr->GetMaskSize() * sizeof(ui64);
316-
TBase::FreeWithSize(mem, sz + extraSize);
315+
// Destroying delete: reads Size()/GetMaskSize() before running the destructor, since
316+
// with -fsanitize-memory-use-after-dtor the destructor poisons the object's storage.
317+
void operator delete(TSelectRangeLazyRow* self, std::destroying_delete_t) {
318+
const auto fullSize = sizeof(TSelectRangeLazyRow)
319+
+ self->Size() * sizeof(NUdf::TUnboxedValue)
320+
+ self->GetMaskSize() * sizeof(ui64);
321+
self->~TSelectRangeLazyRow();
322+
TBase::FreeWithSize(self, fullSize);
317323
}
318324

319325
void operator delete[](void *mem, std::size_t sz) = delete;

ydb/core/external_sources/external_source_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ IExternalSource::TPtr BuildIcebergSource(const std::vector<TRegExMatch>& hostnam
132132
IExternalSourceFactory::TPtr CreateExternalSourceFactory(const std::vector<TString>& hostnamePatterns,
133133
NActors::TActorSystem* actorSystem,
134134
size_t pathsLimit,
135-
std::shared_ptr<NYql::ISecuredServiceAccountCredentialsFactory> credentialsFactory,
135+
std::shared_ptr<NYql::IStructuredTokenCredentialsFactory> credentialsFactory,
136136
bool enableInfer,
137137
bool allowLocalFiles,
138138
bool allExternalDataSourcesAreAvailable,

ydb/core/external_sources/external_source_factory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct IExternalSourceFactory : public TThrRefBase {
1818
IExternalSourceFactory::TPtr CreateExternalSourceFactory(const std::vector<TString>& hostnamePatterns,
1919
NActors::TActorSystem* actorSystem = nullptr,
2020
size_t pathsLimit = 50000,
21-
std::shared_ptr<NYql::ISecuredServiceAccountCredentialsFactory> credentialsFactory = nullptr,
21+
std::shared_ptr<NYql::IStructuredTokenCredentialsFactory> credentialsFactory = nullptr,
2222
bool enableInfer = false,
2323
bool allowLocalFiles = false,
2424
bool allExternalDataSourcesAreAvailable = true,

0 commit comments

Comments
 (0)