Skip to content
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.

Sign up for GitHub

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

Fix memory leak in external data source manager #3961

Merged
merged 1 commit into from
Apr 22, 2024
Merged

Fix memory leak in external data source manager #3961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,22 +182,25 @@ NThreading::TFuture<TExternalDataSourceManager::TYqlConclusionStatus> TExternalD
TInternalModificationContext& context) const {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(context.GetExternalData().GetDatabase());
if (context.GetExternalData().GetUserToken()) {
ev->Record.SetUserToken(context.GetExternalData().GetUserToken()->GetSerializedToken());
}

auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
NKikimrSchemeOp::TModifyScheme schemeTx;
FillCreateExternalDataSourceCommand(schemeTx, settings, context);

auto validationFuture = ValidateCreateExternalDatasource(schemeTx.GetCreateExternalDataSource(), context);

return validationFuture.Apply([ev = ev.Release(), context, schemeTx](const NThreading::TFuture<TExternalDataSourceManager::TYqlConclusionStatus>& f) {
return validationFuture.Apply([context, schemeTx](const NThreading::TFuture<TExternalDataSourceManager::TYqlConclusionStatus>& f) {
if (const auto& value = f.GetValue(); value.IsFail()) {
return NThreading::MakeFuture(value);
}
return SendSchemeRequest(ev, context.GetExternalData().GetActorSystem(), schemeTx.GetFailedOnAlreadyExists(), schemeTx.GetSuccessOnNotExist());

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(context.GetExternalData().GetDatabase());
if (context.GetExternalData().GetUserToken()) {
ev->Record.SetUserToken(context.GetExternalData().GetUserToken()->GetSerializedToken());
}

*ev->Record.MutableTransaction()->MutableModifyScheme() = schemeTx;

return SendSchemeRequest(ev.Release(), context.GetExternalData().GetActorSystem(), schemeTx.GetFailedOnAlreadyExists(), schemeTx.GetSuccessOnNotExist());
});
}

Expand Down Expand Up @@ -256,14 +259,8 @@ NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusio
const ui32 /*nodeId*/, const NMetadata::IClassBehaviour::TPtr& /*manager*/, const IOperationsManager::TExternalModificationContext& context) const {
using TRequest = TEvTxUserProxy::TEvProposeTransaction;

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(context.GetDatabase());
if (context.GetUserToken()) {
ev->Record.SetUserToken(context.GetUserToken()->GetSerializedToken());
}

auto validationFuture = NThreading::MakeFuture(TExternalDataSourceManager::TYqlConclusionStatus::Success());
auto& schemeTx = *ev->Record.MutableTransaction()->MutableModifyScheme();
NKikimrSchemeOp::TModifyScheme schemeTx;
switch (schemeOperation.GetOperationCase()) {
case NKqpProto::TKqpSchemeOperation::kCreateExternalDataSource: {
const auto& createExternalDataSource = schemeOperation.GetCreateExternalDataSource();
Expand All @@ -282,11 +279,20 @@ NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusio
TStringBuilder() << "Execution of prepare operation for EXTERNAL_DATA_SOURCE object: unsupported operation: " << int(schemeOperation.GetOperationCase())));
}

return validationFuture.Apply([ev = ev.Release(), context, schemeTx](const NThreading::TFuture<TExternalDataSourceManager::TYqlConclusionStatus>& f) {
return validationFuture.Apply([context, schemeTx](const NThreading::TFuture<TExternalDataSourceManager::TYqlConclusionStatus>& f) {
if (const auto& value = f.GetValue(); value.IsFail()) {
return NThreading::MakeFuture(value);
}
return SendSchemeRequest(ev, context.GetActorSystem(), schemeTx.GetFailedOnAlreadyExists(), schemeTx.GetSuccessOnNotExist());

auto ev = MakeHolder<TRequest>();
ev->Record.SetDatabaseName(context.GetDatabase());
if (context.GetUserToken()) {
ev->Record.SetUserToken(context.GetUserToken()->GetSerializedToken());
}

*ev->Record.MutableTransaction()->MutableModifyScheme() = schemeTx;

return SendSchemeRequest(ev.Release(), context.GetActorSystem(), schemeTx.GetFailedOnAlreadyExists(), schemeTx.GetSuccessOnNotExist());
});
}

Expand Down
Loading