Skip to content

Commit 8a88f91

Browse files
authored
Fix deprecated this capture warning (#18549)
1 parent 6f2d093 commit 8a88f91

21 files changed

+31
-31
lines changed

ydb/core/blobstorage/nodewarden/node_warden_impl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ void TNodeWarden::HandleReadCache() {
495495
ex = std::current_exception();
496496
}
497497

498-
return [=] {
498+
return [=, this] {
499499
NKikimrBlobStorage::TNodeWardenCache proto;
500500
try {
501501
if (IgnoreCache) {
@@ -897,7 +897,7 @@ void TNodeWarden::SendDropDonorQuery(ui32 nodeId, ui32 pdiskId, ui32 vslotId, co
897897
} else {
898898
Send(DistributedConfigKeeperId, ev.release(), 0, cookie);
899899
}
900-
InvokeCallbacks.emplace(cookie, [=](TEvNodeConfigInvokeOnRootResult& msg) {
900+
InvokeCallbacks.emplace(cookie, [=, this](TEvNodeConfigInvokeOnRootResult& msg) {
901901
if (msg.Record.GetStatus() != NKikimrBlobStorage::TEvNodeConfigInvokeOnRootResult::OK) {
902902
for (const auto& vdisk : StorageConfig.GetBlobStorageConfig().GetServiceSet().GetVDisks()) {
903903
const TVDiskID currentVDiskId = VDiskIDFromVDiskID(vdisk.GetVDiskID());
@@ -946,7 +946,7 @@ void TNodeWarden::SendVDiskReport(TVSlotId vslotId, const TVDiskID &vDiskId,
946946
} else {
947947
Send(DistributedConfigKeeperId, ev.release(), 0, cookie);
948948
}
949-
InvokeCallbacks.emplace(cookie, [=](TEvNodeConfigInvokeOnRootResult& msg) {
949+
InvokeCallbacks.emplace(cookie, [=, this](TEvNodeConfigInvokeOnRootResult& msg) {
950950
if (msg.Record.GetStatus() != NKikimrBlobStorage::TEvNodeConfigInvokeOnRootResult::OK) {
951951
for (const auto& vdisk : StorageConfig.GetBlobStorageConfig().GetServiceSet().GetVDisks()) {
952952
const TVDiskID currentVDiskId = VDiskIDFromVDiskID(vdisk.GetVDiskID());

ydb/core/blobstorage/nodewarden/node_warden_pdisk.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ namespace NKikimr::NStorage {
298298

299299
const ui64 cookie = NextConfigCookie++;
300300
SendToController(std::move(ev), cookie);
301-
ConfigInFlight.emplace(cookie, [=](TEvBlobStorage::TEvControllerConfigResponse *ev) {
301+
ConfigInFlight.emplace(cookie, [=, this](TEvBlobStorage::TEvControllerConfigResponse *ev) {
302302
if (auto node = PDiskRestartRequests.extract(requestCookie)) {
303303
if (!ev || !ev->Record.GetResponse().GetSuccess()) {
304304
OnUnableToRestartPDisk(node.mapped(), ev ? ev->Record.GetResponse().GetErrorDescription() : "BSC disconnected");

ydb/core/blobstorage/nodewarden/node_warden_resource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void TNodeWarden::ApplyServiceSet(const NKikimrBlobStorage::TNodeWardenServiceSe
4242
bool comprehensive, bool updateCache, const char *origin) {
4343
if (Cfg->IsCacheEnabled() && updateCache) {
4444
Y_ABORT_UNLESS(!isStatic);
45-
return EnqueueSyncOp(WrapCacheOp(UpdateServiceSet(serviceSet, comprehensive, [=] {
45+
return EnqueueSyncOp(WrapCacheOp(UpdateServiceSet(serviceSet, comprehensive, [=, this] {
4646
ApplyServiceSet(serviceSet, false, comprehensive, false, origin);
4747
})));
4848
}

ydb/core/client/server/grpc_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ void TGRpcService::InitService(grpc::ServerCompletionQueue *cq, NYdbGrpc::TLogge
377377
TFuture<void> TGRpcService::Prepare(TActorSystem* system, const TActorId& pqMeta, const TActorId& msgBusProxy,
378378
TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) {
379379
auto promise = NewPromise<void>();
380-
InitCb_ = [=]() mutable {
380+
InitCb_ = [=, this]() mutable {
381381
try {
382382
ActorSystem = system;
383383
PQMeta = pqMeta;

ydb/core/fq/libs/control_plane_storage/internal/task_get.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ void TYdbControlPlaneStorageActor::Handle(TEvControlPlaneStorage::TEvGetTaskRequ
368368

369369
auto responseTasks = std::make_shared<TResponseTasks>();
370370

371-
auto prepareParams = [=, commonCounters=requestCounters.Common,
371+
auto prepareParams = [=, this, commonCounters=requestCounters.Common,
372372
actorSystem=NActors::TActivationContext::ActorSystem(),
373373
responseTasks=responseTasks,
374374
tenantInfo=ev->Get()->TenantInfo
@@ -431,7 +431,7 @@ void TYdbControlPlaneStorageActor::Handle(TEvControlPlaneStorage::TEvGetTaskRequ
431431
const auto query = queryBuilder.Build();
432432
auto [readStatus, resultSets] = Read(query.Sql, query.Params, requestCounters, debugInfo, TTxSettings::StaleRO());
433433
auto result = readStatus.Apply(
434-
[=,
434+
[=, this,
435435
resultSets=resultSets,
436436
requestCounters=requestCounters,
437437
debugInfo=debugInfo,

ydb/core/fq/libs/control_plane_storage/internal/task_ping.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ TYdbControlPlaneStorageActor::TPingTaskParams TYdbControlPlaneStorageActor::Cons
7171

7272
auto meteringRecords = std::make_shared<std::vector<TString>>();
7373

74-
auto prepareParams = [=, counters=counters, actorSystem = NActors::TActivationContext::ActorSystem(), request=request](const std::vector<TResultSet>& resultSets) mutable {
74+
auto prepareParams = [=, this, counters=counters, actorSystem = NActors::TActivationContext::ActorSystem(), request=request](const std::vector<TResultSet>& resultSets) mutable {
7575
TString jobId;
7676
FederatedQuery::Query query;
7777
FederatedQuery::Internal::QueryInternal internal;
@@ -258,7 +258,7 @@ TYdbControlPlaneStorageActor::TPingTaskParams TYdbControlPlaneStorageActor::Cons
258258
"FROM `" PENDING_SMALL_TABLE_NAME "` WHERE `" TENANT_COLUMN_NAME "` = $tenant AND `" SCOPE_COLUMN_NAME "` = $scope AND `" QUERY_ID_COLUMN_NAME "` = $query_id;\n"
259259
);
260260

261-
auto prepareParams = [=](const std::vector<TResultSet>& resultSets) {
261+
auto prepareParams = [=, this](const std::vector<TResultSet>& resultSets) {
262262
TString owner;
263263
FederatedQuery::Internal::QueryInternal internal;
264264

ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ TAsyncStatus TDbRequester::Validate(
426426
const TValidationQuery& validatonItem = validators[item];
427427
CollectDebugInfo(validatonItem.Query, validatonItem.Params, session, debugInfo);
428428
auto result = session.ExecuteDataQuery(validatonItem.Query, item == 0 ? TTxControl::BeginTx(transactionMode) : TTxControl::Tx(**transaction), validatonItem.Params, NYdb::NTable::TExecDataQuerySettings().KeepInQueryCache(true));
429-
return result.Apply([=, validator=validatonItem.Validator, query=validatonItem.Query] (const TFuture<TDataQueryResult>& future) {
429+
return result.Apply([=, this, validator=validatonItem.Validator, query=validatonItem.Query] (const TFuture<TDataQueryResult>& future) {
430430
NYdb::NTable::TDataQueryResult result = future.GetValue();
431431
*transaction = result.GetTransaction();
432432
auto status = static_cast<TStatus>(result);
@@ -476,7 +476,7 @@ TAsyncStatus TDbRequester::Write(
476476
});
477477
};
478478

479-
auto handler = [=, requestCounters=requestCounters] (TSession session) mutable {
479+
auto handler = [=, this, requestCounters=requestCounters] (TSession session) mutable {
480480
if (*retryCount != 0) {
481481
requestCounters.IncRetry();
482482
}
@@ -620,7 +620,7 @@ TAsyncStatus TDbRequester::ReadModifyWrite(
620620
});
621621
};
622622

623-
auto handler = [=, requestCounters=requestCounters] (TSession session) mutable {
623+
auto handler = [=, this, requestCounters=requestCounters] (TSession session) mutable {
624624
if (*retryCount != 0) {
625625
requestCounters.IncRetry();
626626
}

ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_bindings.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ void TYdbControlPlaneStorageActor::Handle(TEvControlPlaneStorage::TEvModifyBindi
473473
);
474474

475475
std::shared_ptr<std::pair<FederatedQuery::ModifyBindingResult, TAuditDetails<FederatedQuery::Binding>>> response = std::make_shared<std::pair<FederatedQuery::ModifyBindingResult, TAuditDetails<FederatedQuery::Binding>>>();
476-
auto prepareParams = [=, config=Config, commonCounters=requestCounters.Common](const std::vector<TResultSet>& resultSets) {
476+
auto prepareParams = [=, this, config=Config, commonCounters=requestCounters.Common](const std::vector<TResultSet>& resultSets) {
477477
if (resultSets.size() != 2) {
478478
ythrow NYql::TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "Result set size is not equal to 2 but equal " << resultSets.size() << ". Please contact internal support";
479479
}

ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_compute_database.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void TYdbControlPlaneStorageActor::Handle(TEvControlPlaneStorage::TEvCreateDatab
3333
"WHERE `" SCOPE_COLUMN_NAME "` = $scope;"
3434
);
3535

36-
auto prepareParams = [=](const std::vector<TResultSet>& resultSets) {
36+
auto prepareParams = [=, this](const std::vector<TResultSet>& resultSets) {
3737
if (resultSets.size() != 1) {
3838
ythrow NYql::TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "Result set size is not equal to 1 but equal " << resultSets.size() << ". Please contact internal support";
3939
}
@@ -190,7 +190,7 @@ void TYdbControlPlaneStorageActor::Handle(TEvControlPlaneStorage::TEvModifyDatab
190190
"WHERE `" SCOPE_COLUMN_NAME "` = $scope;"
191191
);
192192

193-
auto prepareParams = [=, synchronized = ev->Get()->Synchronized, workloadManagerSynchronized = ev->Get()->WorkloadManagerSynchronized, commonCounters=requestCounters.Common](const std::vector<TResultSet>& resultSets) {
193+
auto prepareParams = [=, this, synchronized = ev->Get()->Synchronized, workloadManagerSynchronized = ev->Get()->WorkloadManagerSynchronized, commonCounters=requestCounters.Common](const std::vector<TResultSet>& resultSets) {
194194
if (resultSets.size() != 1) {
195195
ythrow NYql::TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "Result set size is not equal to 1 but equal " << resultSets.size() << ". Please contact internal support";
196196
}

ydb/core/fq/libs/control_plane_storage/ydb_control_plane_storage_connections.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ void TYdbControlPlaneStorageActor::Handle(TEvControlPlaneStorage::TEvModifyConne
503503
);
504504

505505
std::shared_ptr<std::pair<FederatedQuery::ModifyConnectionResult, TAuditDetails<FederatedQuery::Connection>>> response = std::make_shared<std::pair<FederatedQuery::ModifyConnectionResult, TAuditDetails<FederatedQuery::Connection>>>();
506-
auto prepareParams = [=, config=Config, commonCounters=requestCounters.Common](const std::vector<TResultSet>& resultSets) {
506+
auto prepareParams = [=, this, config=Config, commonCounters=requestCounters.Common](const std::vector<TResultSet>& resultSets) {
507507
if (resultSets.size() != 1) {
508508
ythrow NYql::TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "Result set size is not equal to 1 but equal " << resultSets.size() << ". Please contact internal support";
509509
}

0 commit comments

Comments
 (0)