Merge e64f2b6 into d9cdc77

zverevgeny · web-flow · commit cf71aa1efe7e · 2025-01-04T11:45:29.000Z
diff --git a/ydb/core/tx/columnshard/blobs_action/transaction/tx_blobs_written.h b/ydb/core/tx/columnshard/blobs_action/transaction/tx_blobs_written.h
@@ -12,9 +12,9 @@ namespace NKikimr::NColumnShard {
 
 class TColumnShard;
 
-class TTxBlobsWritingFinished: public TExtendedTransactionBase<TColumnShard> {
+class TTxBlobsWritingFinished: public TExtendedTransactionBase {
 private:
-    using TBase = TExtendedTransactionBase<TColumnShard>;
+    using TBase = TExtendedTransactionBase;
     std::vector<TInsertedPortions> Packs;
     const std::shared_ptr<NOlap::IBlobsWritingAction> WritingActions;
     std::optional<NOlap::TSnapshot> CommitSnapshot;
@@ -51,9 +51,9 @@ class TTxBlobsWritingFinished: public TExtendedTransactionBase<TColumnShard> {
     }
 };
 
-class TTxBlobsWritingFailed: public TExtendedTransactionBase<TColumnShard> {
+class TTxBlobsWritingFailed: public TExtendedTransactionBase {
 private:
-    using TBase = TExtendedTransactionBase<TColumnShard>;
+    using TBase = TExtendedTransactionBase;
     const NKikimrProto::EReplyStatus PutBlobResult;
     std::vector<TInsertedPortions> Packs;
 
diff --git a/ydb/core/tx/columnshard/blobs_action/transaction/tx_write.h b/ydb/core/tx/columnshard/blobs_action/transaction/tx_write.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NColumnShard {
 
-class TTxWrite: public TExtendedTransactionBase<TColumnShard> {
+class TTxWrite: public TExtendedTransactionBase {
 private:
-    using TBase = TExtendedTransactionBase<TColumnShard>;
+    using TBase = TExtendedTransactionBase;
 
 public:
     TTxWrite(TColumnShard* self, const TEvPrivate::TEvWriteBlobsResult::TPtr& putBlobResult)
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_data_from_source.h b/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_data_from_source.h
@@ -9,9 +9,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxDataFromSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxDataFromSource: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TDestinationSession> Session;
     THashMap<ui64, NEvents::TPathIdData> PortionsByPathId;
     THashMap<TString, THashSet<NBlobCache::TUnifiedBlobId>> SharedBlobIds;
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_ack_from_initiator.h b/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_ack_from_initiator.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxFinishAckFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxFinishAckFromInitiator: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TDestinationSession> Session;
 protected:
     virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.h b/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_finish_from_source.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxFinishFromSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxFinishFromSource: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TDestinationSession> Session;
     const TTabletId SourceTabletId;
     bool Finished = false;
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_start_from_initiator.h b/ydb/core/tx/columnshard/data_sharing/destination/transactions/tx_start_from_initiator.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxProposeFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxProposeFromInitiator: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TDestinationSession> Session;
     THashMap<TString, std::shared_ptr<TDestinationSession>>* Sessions;
 protected:
@@ -23,9 +23,9 @@ class TTxProposeFromInitiator: public NColumnShard::TExtendedTransactionBase<NCo
     TTxType GetTxType() const override { return NColumnShard::TXTYPE_DATA_SHARING_PROPOSE_FROM_INITIATOR; }
 };
 
-class TTxConfirmFromInitiator: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxConfirmFromInitiator: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TDestinationSession> Session;
 protected:
     virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
diff --git a/ydb/core/tx/columnshard/data_sharing/modification/transactions/tx_change_blobs_owning.h b/ydb/core/tx/columnshard/data_sharing/modification/transactions/tx_change_blobs_owning.h
@@ -7,9 +7,9 @@ namespace NKikimr::NOlap::NDataSharing {
 
 class TTaskForTablet;
 
-class TTxApplyLinksModification: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxApplyLinksModification: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TTaskForTablet> Task;
     const TTabletId InitiatorTabletId;
     const TString SessionId;
diff --git a/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_data_ack_to_source.h b/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_data_ack_to_source.h
@@ -6,9 +6,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxDataAckToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxDataAckToSource: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TSourceSession> Session;
     THashMap<TString, TTabletsByBlob> SharedBlobIds;
 protected:
diff --git a/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_finish_ack_to_source.h b/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_finish_ack_to_source.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxFinishAckToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxFinishAckToSource: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TSourceSession> Session;
 protected:
     virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
diff --git a/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_source_cursor.h b/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_source_cursor.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxStartSourceCursor: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxStartSourceCursor: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
 
     TSourceSession* Session;
     THashMap<ui64, std::vector<TPortionDataAccessor>> Portions;
diff --git a/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_to_source.h b/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_start_to_source.h
@@ -5,9 +5,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxStartToSource: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxStartToSource: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TSourceSession> Session;
     THashMap<TString, std::shared_ptr<TSourceSession>>* Sessions;
 protected:
diff --git a/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_write_source_cursor.h b/ydb/core/tx/columnshard/data_sharing/source/transactions/tx_write_source_cursor.h
@@ -6,9 +6,9 @@
 
 namespace NKikimr::NOlap::NDataSharing {
 
-class TTxWriteSourceCursor: public NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTxWriteSourceCursor: public NColumnShard::TExtendedTransactionBase {
 private:
-    using TBase = NColumnShard::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = NColumnShard::TExtendedTransactionBase;
     std::shared_ptr<TSourceSession> Session;
 protected:
     virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx) override;
diff --git a/ydb/core/tx/columnshard/tablet/ext_tx_base.cpp b/ydb/core/tx/columnshard/tablet/ext_tx_base.cpp
@@ -1,5 +1,24 @@
-#include "tx_extension.h"
+#include "ext_tx_base.h"
+#include <ydb/core/tx/columnshard/columnshard_impl.h>
 
-namespace NKikimr::NColumnShard::NDataSharing {
 
-}
+namespace NKikimr::NColumnShard {
+
+bool TExtendedTransactionBase::Execute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& ctx) {
+    NActors::TLogContextGuard logGuard = NActors::TLogContextBuilder::Build()("tablet_id", Self->TabletID())("local_tx_no", TabletTxNo)("method", "execute")("tx_info", TxInfo);
+    return DoExecute(txc, ctx);
+}
+void TExtendedTransactionBase::Complete(const NActors::TActorContext& ctx) {
+    NActors::TLogContextGuard logGuard = NActors::TLogContextBuilder::Build()("tablet_id", Self->TabletID())("local_tx_no", TabletTxNo)("method", "complete")("tx_info", TxInfo);
+    DoComplete(ctx);
+}
+
+TExtendedTransactionBase::TExtendedTransactionBase(TColumnShard* self, const TString& txInfo)
+    : TBase(self)
+    , TxInfo(txInfo)
+    , TabletTxNo(++Self->TabletTxCounter)
+{
+
+}
+
+} //namespace NKikimr::NColumnShard
diff --git a/ydb/core/tx/columnshard/tablet/ext_tx_base.h b/ydb/core/tx/columnshard/tablet/ext_tx_base.h
@@ -4,33 +4,22 @@
 
 namespace NKikimr::NColumnShard {
 
+class TColumnShard;
+
 //Base class for LocalDB transactions with ColumnShard specific
-template <class TShard>
-class TExtendedTransactionBase: public NTabletFlatExecutor::TTransactionBase<TShard> {
+class TExtendedTransactionBase: public NTabletFlatExecutor::TTransactionBase<TColumnShard> {
 private:
     const TString TxInfo;
     const ui32 TabletTxNo;
-    using TBase = NTabletFlatExecutor::TTransactionBase<TShard>;
+    using TBase = NTabletFlatExecutor::TTransactionBase<TColumnShard>;
     virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& ctx) = 0;
     virtual void DoComplete(const NActors::TActorContext & ctx) = 0;
 
 public:
-    virtual bool Execute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& ctx) override final {
-        NActors::TLogContextGuard logGuard = NActors::TLogContextBuilder::Build()("tablet_id", TBase::Self->TabletID())("local_tx_no", TabletTxNo)("tx_info", TxInfo);
-        return DoExecute(txc, ctx);
-    }
-    virtual void Complete(const NActors::TActorContext& ctx) override final {
-        NActors::TLogContextGuard logGuard = NActors::TLogContextBuilder::Build()("tablet_id", TBase::Self->TabletID())("local_tx_no", TabletTxNo)("tx_info", TxInfo);
-        return DoComplete(ctx);
-    }
-
-    TExtendedTransactionBase(TShard* self, const TString& txInfo = Default<TString>())
-        : TBase(self)
-        , TxInfo(txInfo)
-        , TabletTxNo(++TBase::Self->TabletTxCounter)
-    {
+    virtual bool Execute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& ctx) override final;
+    virtual void Complete(const NActors::TActorContext& ctx) override final;
 
-    }
+    TExtendedTransactionBase(TColumnShard* self, const TString& txInfo = Default<TString>());
 };
 
 } //namespace NKikimr::NColumnShard
diff --git a/ydb/core/tx/columnshard/tablet/ya.make b/ydb/core/tx/columnshard/tablet/ya.make
@@ -1,7 +1,7 @@
 LIBRARY()
 
 SRCS(
-    ext_tx_base.h
+    ext_tx_base.cpp
     write_queue.cpp
 )
 
diff --git a/ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h b/ydb/core/tx/columnshard/transactions/operators/ev_write/primary.h
@@ -77,9 +77,9 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
     virtual TString DoDebugString() const override {
         return "EV_WRITE_PRIMARY";
     }
-    class TTxWriteReceivedBrokenFlag: public TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedBrokenFlag: public TExtendedTransactionBase {
     private:
-        using TBase = TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase;
         const ui64 TxId;
         const ui64 TabletId;
         const bool BrokenFlag;
@@ -126,9 +126,9 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
         return std::make_unique<TTxWriteReceivedBrokenFlag>(owner, GetTxId(), sendTabletId, broken);
     }
 
-    class TTxWriteReceivedResultAck: public TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedResultAck: public TExtendedTransactionBase {
     private:
-        using TBase = TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase;
         const ui64 TxId;
         const ui64 TabletId;
 
@@ -222,9 +222,9 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
         CheckFinished(owner);
     }
 
-    class TTxStartPreparation: public TExtendedTransactionBase<TColumnShard> {
+    class TTxStartPreparation: public TExtendedTransactionBase {
     private:
-        using TBase = TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase;
         const ui64 TxId;
 
         virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& /*ctx*/) override {
diff --git a/ydb/core/tx/columnshard/transactions/operators/ev_write/secondary.h b/ydb/core/tx/columnshard/transactions/operators/ev_write/secondary.h
@@ -58,9 +58,9 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
     virtual TString DoDebugString() const override {
         return "EV_WRITE_SECONDARY";
     }
-    class TTxWriteReceivedAck: public TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedAck: public TExtendedTransactionBase {
     private:
-        using TBase = TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase;
         const ui64 TxId;
         bool NeedContinueFlag = false;
 
@@ -99,9 +99,9 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
         return std::make_unique<TTxWriteReceivedAck>(owner, GetTxId());
     }
 
-    class TTxWriteReceivedBrokenFlag: public TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedBrokenFlag: public TExtendedTransactionBase {
     private:
-        using TBase = TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase;
         const ui64 TxId;
         const bool BrokenFlag;
 
@@ -170,9 +170,9 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
         }
     }
 
-    class TTxStartPreparation: public TExtendedTransactionBase<TColumnShard> {
+    class TTxStartPreparation: public TExtendedTransactionBase {
     private:
-        using TBase = TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase;
         const ui64 TxId;
 
         virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& /*ctx*/) override {
