Refactor export/import cancel ack transaction (#24788)

Author: UgnineSirdis

ydb/core/tx/schemeshard/schemeshard_export__cancel.cpp

@@ -108,11 +108,18 @@ struct TSchemeShard::TExport::TTxCancel: public TSchemeShard::TXxport::TTxBase {
 }; // TTxCancel
 
 struct TSchemeShard::TExport::TTxCancelAck: public TSchemeShard::TXxport::TTxBase {
-    TEvSchemeShard::TEvCancelTxResult::TPtr CancelResult;
+    const ui64 ExportId;
+    const TTxId TxId;
 
-    explicit TTxCancelAck(TSelf *self, TEvSchemeShard::TEvCancelTxResult::TPtr& ev)
+    explicit TTxCancelAck(TSelf* self, ui64 exportId, TTxId txId)
         : TXxport::TTxBase(self)
-        , CancelResult(ev)
+        , ExportId(exportId)
+        , TxId(txId)
+    {
+    }
+
+    explicit TTxCancelAck(TSelf* self, TEvSchemeShard::TEvCancelTxResult::TPtr& ev)
+        : TTxCancelAck(self, ev->Cookie, TTxId(ev->Get()->Record.GetTargetTxId()))
     {
     }
 
@@ -121,14 +128,11 @@ struct TSchemeShard::TExport::TTxCancelAck: public TSchemeShard::TXxport::TTxBas
     }
 
     bool DoExecute(TTransactionContext& txc, const TActorContext&) override {
-        const ui64 id = CancelResult->Cookie;
-        const auto backupTxId = TTxId(CancelResult->Get()->Record.GetTargetTxId());
-
-        if (!Self->Exports.contains(id)) {
+        if (!Self->Exports.contains(ExportId)) {
             return true;
         }
 
-        TExportInfo::TPtr exportInfo = Self->Exports.at(id);
+        TExportInfo::TPtr exportInfo = Self->Exports.at(ExportId);
 
         if (exportInfo->State != TExportInfo::EState::Cancellation) {
             return true;
@@ -150,7 +154,7 @@ struct TSchemeShard::TExport::TTxCancelAck: public TSchemeShard::TXxport::TTxBas
                 ++cancellableItems;
             }
 
-            if (item.WaitTxId == backupTxId) {
+            if (item.WaitTxId == TxId) {
                 found = true;
 
                 item.State = TExportInfo::EState::Cancelled;
@@ -166,7 +170,7 @@ struct TSchemeShard::TExport::TTxCancelAck: public TSchemeShard::TXxport::TTxBas
             return true;
         }
 
-        Self->TxIdToExport.erase(backupTxId);
+        Self->TxIdToExport.erase(TxId);
 
         NIceDb::TNiceDb db(txc.DB);
         Self->PersistExportItemState(db, *exportInfo, itemIdx);

ydb/core/tx/schemeshard/schemeshard_import__cancel.cpp

@@ -111,18 +111,23 @@ struct TSchemeShard::TImport::TTxCancel: public TSchemeShard::TXxport::TTxBase {
 }; // TTxCancel
 
 struct TSchemeShard::TImport::TTxCancelAck: public TSchemeShard::TXxport::TTxBase {
-    TEvSchemeShard::TEvCancelTxResult::TPtr CancelTxResult = nullptr;
-    TEvIndexBuilder::TEvCancelResponse::TPtr CancelIndexBuildResult = nullptr;
+    const ui64 ImportId;
+    const TTxId TxId;
 
-    explicit TTxCancelAck(TSelf *self, TEvSchemeShard::TEvCancelTxResult::TPtr& ev)
+    explicit TTxCancelAck(TSelf* self, ui64 importId, TTxId txId)
         : TXxport::TTxBase(self)
-        , CancelTxResult(ev)
+        , ImportId(importId)
+        , TxId(txId)
     {
     }
 
-    explicit TTxCancelAck(TSelf *self, TEvIndexBuilder::TEvCancelResponse::TPtr& ev)
-        : TXxport::TTxBase(self)
-        , CancelIndexBuildResult(ev)
+    explicit TTxCancelAck(TSelf* self, TEvSchemeShard::TEvCancelTxResult::TPtr& ev)
+        : TTxCancelAck(self, ev->Cookie, TTxId(ev->Get()->Record.GetTargetTxId()))
+    {
+    }
+
+    explicit TTxCancelAck(TSelf* self, TEvIndexBuilder::TEvCancelResponse::TPtr& ev)
+        : TTxCancelAck(self, ev->Cookie, TTxId(ev->Get()->Record.GetTxId()))
     {
     }
 
@@ -131,23 +136,11 @@ struct TSchemeShard::TImport::TTxCancelAck: public TSchemeShard::TXxport::TTxBas
     }
 
     bool DoExecute(TTransactionContext& txc, const TActorContext&) override {
-        TTxId txId;
-        ui64 id;
-        if (CancelTxResult) {
-            txId = TTxId(CancelTxResult->Get()->Record.GetTargetTxId());
-            id = CancelTxResult->Cookie;
-        } else if (CancelIndexBuildResult) {
-            txId = TTxId(CancelIndexBuildResult->Get()->Record.GetTxId());
-            id = CancelIndexBuildResult->Cookie;
-        } else {
-            Y_ABORT("unreachable");
-        }
-
-        if (!Self->Imports.contains(id)) {
+        if (!Self->Imports.contains(ImportId)) {
             return true;
         }
 
-        TImportInfo::TPtr importInfo = Self->Imports.at(id);
+        TImportInfo::TPtr importInfo = Self->Imports.at(ImportId);
         NIceDb::TNiceDb db(txc.DB);
 
         if (importInfo->State != TImportInfo::EState::Cancellation) {
@@ -170,7 +163,7 @@ struct TSchemeShard::TImport::TTxCancelAck: public TSchemeShard::TXxport::TTxBas
                 ++cancellableItems;
             }
 
-            if (item.WaitTxId == txId) {
+            if (item.WaitTxId == TxId) {
                 found = true;
 
                 item.State = TImportInfo::EState::Cancelled;
@@ -186,7 +179,7 @@ struct TSchemeShard::TImport::TTxCancelAck: public TSchemeShard::TXxport::TTxBas
             return true;
         }
 
-        Self->TxIdToImport.erase(txId);
+        Self->TxIdToImport.erase(TxId);
         Self->PersistImportItemState(db, *importInfo, itemIdx);
 
         if (cancelledItems != cancellableItems) {