From eb25e5a1b161bc74eabc8a4114facadc9bd58a4f Mon Sep 17 00:00:00 2001 From: Daniil Demin Date: Fri, 24 Jan 2025 13:18:03 +0000 Subject: [PATCH] export: review fixes --- .../schemeshard/schemeshard_export__create.cpp | 16 ++++++++++------ .../schemeshard/schemeshard_export__forget.cpp | 5 ----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ydb/core/tx/schemeshard/schemeshard_export__create.cpp b/ydb/core/tx/schemeshard/schemeshard_export__create.cpp index 4ba9bff6a045..41e2f6698a57 100644 --- a/ydb/core/tx/schemeshard/schemeshard_export__create.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_export__create.cpp @@ -16,6 +16,16 @@ #include #include +namespace { + +ui32 PopFront(TDeque& pendingItems) { + const ui32 itemIdx = pendingItems.front(); + pendingItems.pop_front(); + return itemIdx; +} + +} + namespace NKikimr { namespace NSchemeShard { @@ -684,12 +694,6 @@ struct TSchemeShard::TExport::TTxProgress: public TSchemeShard::TXxport::TTxBase } } - ui32 PopFront(TDeque& pendingItems) { - const ui32 itemIdx = pendingItems.front(); - pendingItems.pop_front(); - return itemIdx; - } - void EndExport(TExportInfo::TPtr exportInfo, EState finalState, NIceDb::TNiceDb& db) { exportInfo->State = finalState; exportInfo->EndTime = TAppData::TimeProvider->Now(); diff --git a/ydb/core/tx/schemeshard/schemeshard_export__forget.cpp b/ydb/core/tx/schemeshard/schemeshard_export__forget.cpp index e5f8d9fc55ce..2a4fd3c5f186 100644 --- a/ydb/core/tx/schemeshard/schemeshard_export__forget.cpp +++ b/ydb/core/tx/schemeshard/schemeshard_export__forget.cpp @@ -81,7 +81,6 @@ struct TSchemeShard::TExport::TTxForget: public TSchemeShard::TXxport::TTxBase { exportInfo->State = TExportInfo::EState::Dropping; Self->PersistExportState(db, exportInfo); - TVector itemsToDrop; for (ui32 itemIdx : xrange(exportInfo->Items.size())) { auto& item = exportInfo->Items.at(itemIdx); @@ -91,14 +90,10 @@ struct TSchemeShard::TExport::TTxForget: public TSchemeShard::TXxport::TTxBase { const TPath itemPath = TPath::Resolve(ExportItemPathName(Self, exportInfo, itemIdx), Self); if (itemPath.IsResolved() && !itemPath.IsDeleted()) { item.State = TExportInfo::EState::Dropping; - itemsToDrop.emplace_back(itemIdx); } Self->PersistExportItemState(db, exportInfo, itemIdx); } - LOG_T("TExport::TTxForget, items to drop" - << ", items: " << JoinSeq(", ", itemsToDrop) - ); Progress = true; }