fixes for avoid incorrect txoperator usage on compile phase after update

Author: ivanmorozov333

ydb/core/tx/columnshard/blobs_action/transaction/tx_write.cpp

@@ -88,8 +88,9 @@ bool TTxWrite::Execute(TTransactionContext& txc, const TActorContext&) {
                 proto.SetLockId(operation->GetLockId());
                 TString txBody;
                 Y_ABORT_UNLESS(proto.SerializeToString(&txBody));
-                auto op = Self->GetProgressTxController().StartProposeOnExecute(TTxController::TBasicTxInfo(NKikimrTxColumnShard::TX_KIND_COMMIT_WRITE, operation->GetLockId()),
-                    txBody, writeMeta.GetSource(), operation->GetCookie(), {}, txc);
+                auto op = Self->GetProgressTxController().StartProposeOnExecute(
+                    TTxController::TTxInfo(NKikimrTxColumnShard::TX_KIND_COMMIT_WRITE, operation->GetLockId(), writeMeta.GetSource(), operation->GetCookie(), {}), txBody,
+                    txc);
                 AFL_VERIFY(!op->IsFail());
                 ResultOperators.emplace_back(op);
             } else {

ydb/core/tx/columnshard/columnshard__propose_transaction.cpp

@@ -11,6 +11,8 @@ using namespace NTabletFlatExecutor;
 class TTxProposeTransaction : public NTabletFlatExecutor::TTransactionBase<TColumnShard> {
 private:
     using TBase = NTabletFlatExecutor::TTransactionBase<TColumnShard>;
+    std::optional<TTxController::TTxInfo> TxInfo;
+
 public:
     TTxProposeTransaction(TColumnShard* self, TEvColumnShard::TEvProposeTransaction::TPtr& ev)
         : TBase(self)
@@ -57,7 +59,8 @@ class TTxProposeTransaction : public NTabletFlatExecutor::TTransactionBase<TColu
             seqNo.DeserializeFromProto(Ev->Get()->Record.GetSeqNo()).Validate();
             msgSeqNo = seqNo;
         }
-        TxOperator = Self->GetProgressTxController().StartProposeOnExecute(TTxController::TBasicTxInfo(txKind, txId), txBody, Ev->Get()->GetSource(), Ev->Cookie, msgSeqNo, txc);
+        TxInfo.emplace(txKind, txId, Ev->Get()->GetSource(), Ev->Cookie, msgSeqNo);
+        TxOperator = Self->GetProgressTxController().StartProposeOnExecute(*TxInfo, txBody, txc);
         return true;
     }
 
@@ -67,12 +70,13 @@ class TTxProposeTransaction : public NTabletFlatExecutor::TTransactionBase<TColu
             return;
         }
         AFL_VERIFY(!!TxOperator);
+        AFL_VERIFY(!!TxInfo);
         const ui64 txId = record.GetTxId();
         NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("tablet_id", Self->TabletID())("tx_id", txId)("this", (ui64)this);
         if (TxOperator->IsFail()) {
             TxOperator->SendReply(*Self, ctx);
         } else {
-            if (!Self->GetProgressTxController().IsActualOperator(TxOperator)) {
+            if (!(*TxInfo == TxOperator->GetTxInfo())) {
                 return;
             }
             if (TxOperator->IsAsync()) {

ydb/core/tx/columnshard/columnshard__write.cpp

@@ -283,7 +283,7 @@ bool TProposeWriteTransaction::Execute(TTransactionContext& txc, const TActorCon
     TString txBody;
     Y_ABORT_UNLESS(proto.SerializeToString(&txBody));
     Y_UNUSED(Self->GetProgressTxController().StartProposeOnExecute(
-        TTxController::TBasicTxInfo(NKikimrTxColumnShard::TX_KIND_COMMIT_WRITE, WriteCommit->GetTxId()), txBody, Source, Cookie, {}, txc));
+        TTxController::TTxInfo(NKikimrTxColumnShard::TX_KIND_COMMIT_WRITE, WriteCommit->GetTxId(), Source, Cookie, {}), txBody, txc));
     return true;
 }
 

ydb/core/tx/columnshard/transactions/tx_controller.cpp

@@ -285,12 +285,10 @@ void TTxController::OnTabletInit() {
     }
 }
 
-std::shared_ptr<TTxController::ITransactionOperator> TTxController::StartProposeOnExecute(const TTxController::TBasicTxInfo& txInfo, const TString& txBody, const TActorId source, const ui64 cookie, 
-    const std::optional<TMessageSeqNo>& seqNo, NTabletFlatExecutor::TTransactionContext& txc) {
+std::shared_ptr<TTxController::ITransactionOperator> TTxController::StartProposeOnExecute(const TTxController::TTxInfo& txInfo, const TString& txBody, NTabletFlatExecutor::TTransactionContext& txc) {
     NActors::TLogContextGuard lGuard = NActors::TLogContextBuilder::Build()("method", "TTxController::StartProposeOnExecute")("tx_info", txInfo.DebugString());
     AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("event", "start");
-    std::shared_ptr<TTxController::ITransactionOperator> txOperator(TTxController::ITransactionOperator::TFactory::Construct(txInfo.TxKind,
-        TTxController::TTxInfo(txInfo.TxKind, txInfo.TxId, source, cookie, seqNo)));
+    std::shared_ptr<TTxController::ITransactionOperator> txOperator(TTxController::ITransactionOperator::TFactory::Construct(txInfo.TxKind, txInfo));
     AFL_VERIFY(!!txOperator);
     if (!txOperator->Parse(Owner, txBody)) {
         AFL_ERROR(NKikimrServices::TX_COLUMNSHARD)("error", "cannot parse txOperator");

ydb/core/tx/columnshard/transactions/tx_controller.h

@@ -20,6 +20,8 @@ struct TBasicTxInfo {
         , TxId(txId) {
     }
 
+    bool operator==(const TBasicTxInfo& item) const = default;
+
     ui64 GetTxId() const {
         return TxId;
     }
@@ -37,6 +39,8 @@ struct TFullTxInfo: public TBasicTxInfo {
     ui64 Cookie = 0;
     std::optional<TMessageSeqNo> SeqNo;
 public:
+    bool operator==(const TFullTxInfo& item) const = default;
+
     TString SerializeSeqNoAsString() const {
         if (!SeqNo) {
             return "";
@@ -332,16 +336,12 @@ class TTxController {
     ui64 GetMemoryUsage() const;
     bool HaveOutdatedTxs() const;
 
-    bool IsActualOperator(const std::shared_ptr<TTxController::ITransactionOperator>& op) const {
-        auto opActual = GetTxOperator(op->GetTxId());
-        return !!opActual && (ui64)opActual.get() == (ui64)op.get();
-    }
-
     bool Load(NTabletFlatExecutor::TTransactionContext& txc);
 
     [[nodiscard]] std::shared_ptr<TTxController::ITransactionOperator> UpdateTxSourceInfo(const TFullTxInfo& tx, NTabletFlatExecutor::TTransactionContext& txc);
 
-    [[nodiscard]] std::shared_ptr<TTxController::ITransactionOperator> StartProposeOnExecute(const TBasicTxInfo& txInfo, const TString& txBody, const TActorId source, const ui64 cookie, const std::optional<TMessageSeqNo>& seqNo, NTabletFlatExecutor::TTransactionContext& txc);
+    [[nodiscard]] std::shared_ptr<TTxController::ITransactionOperator> StartProposeOnExecute(
+        const TTxController::TTxInfo& txInfo, const TString& txBody, NTabletFlatExecutor::TTransactionContext& txc);
     void StartProposeOnComplete(const ui64 txId, const TActorContext& ctx);
 
     void FinishProposeOnExecute(const ui64 txId, NTabletFlatExecutor::TTransactionContext& txc);