Merge ccc8239 into 13d57e9

zverevgeny · web-flow · commit 9e2bf0add17a · 2025-01-04T06:17:39.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
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/core/tx/columnshard/blobs_action/abstract/write.h>
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/engines/portions/portion_info.h>
 #include <ydb/core/tx/columnshard/engines/portions/write_with_blobs.h>
 #include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
@@ -12,9 +12,9 @@ namespace NKikimr::NColumnShard {
 
 class TColumnShard;
 
-class TTxBlobsWritingFinished: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+class TTxBlobsWritingFinished: public TExtendedTransactionBase<TColumnShard> {
 private:
-    using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+    using TBase = TExtendedTransactionBase<TColumnShard>;
     std::vector<TInsertedPortions> Packs;
     const std::shared_ptr<NOlap::IBlobsWritingAction> WritingActions;
     std::optional<NOlap::TSnapshot> CommitSnapshot;
@@ -51,9 +51,9 @@ class TTxBlobsWritingFinished: public NOlap::NDataSharing::TExtendedTransactionB
     }
 };
 
-class TTxBlobsWritingFailed: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+class TTxBlobsWritingFailed: public TExtendedTransactionBase<TColumnShard> {
 private:
-    using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+    using TBase = TExtendedTransactionBase<TColumnShard>;
     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
@@ -1,13 +1,13 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
 
 namespace NKikimr::NColumnShard {
 
-class TTxWrite: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+class TTxWrite: public TExtendedTransactionBase<TColumnShard> {
 private:
-    using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+    using TBase = TExtendedTransactionBase<TColumnShard>;
 
 public:
     TTxWrite(TColumnShard* self, const TEvPrivate::TEvWriteBlobsResult::TPtr& putBlobResult)
diff --git a/ydb/core/tx/columnshard/columnshard_impl.h b/ydb/core/tx/columnshard/columnshard_impl.h
@@ -11,7 +11,7 @@
 #include "blobs_action/events/delete_blobs.h"
 #include "counters/columnshard.h"
 #include "counters/counters_manager.h"
-#include "data_sharing/common/transactions/tx_extension.h"
+#include "tablet/ext_tx_base.h"
 #include "data_sharing/destination/events/control.h"
 #include "data_sharing/destination/events/transfer.h"
 #include "data_sharing/manager/sessions.h"
diff --git a/ydb/core/tx/columnshard/data_sharing/common/transactions/ya.make b/ydb/core/tx/columnshard/data_sharing/common/transactions/ya.make
diff --git a/ydb/core/tx/columnshard/data_sharing/common/ya.make b/ydb/core/tx/columnshard/data_sharing/common/ya.make
@@ -2,7 +2,6 @@ LIBRARY()
 
 PEERDIR(
     ydb/core/tx/columnshard/data_sharing/common/session
-    ydb/core/tx/columnshard/data_sharing/common/transactions
     ydb/core/tx/columnshard/data_sharing/common/context
 )
 
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/session/ya.make b/ydb/core/tx/columnshard/data_sharing/destination/session/ya.make
@@ -7,7 +7,7 @@ SRCS(
 PEERDIR(
     ydb/core/tx/columnshard/data_sharing/initiator/controller
     ydb/core/tx/columnshard/data_sharing/common/session
-    ydb/core/tx/columnshard/data_sharing/common/transactions
+    ydb/core/tx/columnshard/tablet
     ydb/core/tx/columnshard/data_sharing/destination/transactions
 )
 
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
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/core/tx/columnshard/blob_cache.h>
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/destination/events/transfer.h>
 #include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>
 #include <ydb/core/tx/columnshard/data_sharing/manager/shared_blobs.h>
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>
 
 namespace NKikimr::NOlap::NDataSharing {
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>
 
 namespace NKikimr::NOlap::NDataSharing {
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/destination/session/destination.h>
 
 namespace NKikimr::NOlap::NDataSharing {
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/transactions/ya.make b/ydb/core/tx/columnshard/data_sharing/destination/transactions/ya.make
@@ -10,7 +10,7 @@ SRCS(
 PEERDIR(
     ydb/core/tx/tiering
     ydb/core/tx/columnshard/data_sharing/protos
-    ydb/core/tx/columnshard/data_sharing/common/transactions
+    ydb/core/tx/columnshard/tablet
 )
 
 END()
diff --git a/ydb/core/tx/columnshard/data_sharing/modification/tasks/ya.make b/ydb/core/tx/columnshard/data_sharing/modification/tasks/ya.make
@@ -7,7 +7,7 @@ SRCS(
 PEERDIR(
     ydb/core/tx/columnshard/data_sharing/initiator/controller
     ydb/core/tx/columnshard/data_sharing/common/session
-    ydb/core/tx/columnshard/data_sharing/common/transactions
+    ydb/core/tx/columnshard/tablet
     ydb/core/tx/columnshard/data_sharing/destination/transactions
 )
 
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
@@ -1,7 +1,7 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
 #include <ydb/core/tx/columnshard/engines/writer/indexed_blob_constructor.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 
 namespace NKikimr::NOlap::NDataSharing {
 
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
 #include <ydb/core/tx/columnshard/blob_cache.h>
 
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
 
 namespace NKikimr::NOlap::NDataSharing {
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
 
 namespace NKikimr::NOlap::NDataSharing {
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
 
 namespace NKikimr::NOlap::NDataSharing {
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
@@ -1,6 +1,6 @@
 #pragma once
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 #include <ydb/core/tx/columnshard/data_sharing/source/session/source.h>
 #include <ydb/core/tx/columnshard/blob_cache.h>
 
diff --git a/ydb/core/tx/columnshard/data_sharing/source/transactions/ya.make b/ydb/core/tx/columnshard/data_sharing/source/transactions/ya.make
@@ -9,7 +9,7 @@ SRCS(
 )
 
 PEERDIR(
-    ydb/core/tx/columnshard/data_sharing/common/transactions
+    ydb/core/tx/columnshard/tablet
 )
 
 END()
diff --git a/ydb/core/tx/columnshard/inflight_request_tracker.cpp b/ydb/core/tx/columnshard/inflight_request_tracker.cpp
@@ -1,8 +1,7 @@
 #include "columnshard_impl.h"
 #include "columnshard_schema.h"
 #include "inflight_request_tracker.h"
-
-#include "data_sharing/common/transactions/tx_extension.h"
+#include "tablet/ext_tx_base.h"
 #include "engines/column_engine.h"
 #include "engines/reader/plain_reader/constructor/read_metadata.h"
 #include "hooks/abstract/abstract.h"
@@ -60,9 +59,9 @@ void TInFlightReadsTracker::AddToInFlightRequest(
 }
 
 namespace {
-class TTransactionSavePersistentSnapshots: public NOlap::NDataSharing::TExtendedTransactionBase<NColumnShard::TColumnShard> {
+class TTransactionSavePersistentSnapshots: public TExtendedTransactionBase<NColumnShard::TColumnShard> {
 private:
-    using TBase = NOlap::NDataSharing::TExtendedTransactionBase<NColumnShard::TColumnShard>;
+    using TBase = TExtendedTransactionBase<NColumnShard::TColumnShard>;
     const std::set<NOlap::TSnapshot> SaveSnapshots;
     const std::set<NOlap::TSnapshot> RemoveSnapshots;
     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
diff --git a/ydb/core/tx/columnshard/tablet/ext_tx_base.h b/ydb/core/tx/columnshard/tablet/ext_tx_base.h
@@ -2,8 +2,9 @@
 #include <ydb/core/tablet_flat/tablet_flat_executor.h>
 #include <ydb/library/actors/core/actor.h>
 
-namespace NKikimr::NOlap::NDataSharing {
+namespace NKikimr::NColumnShard {
 
+//Base class for LocalDB transactions with ColumnShard specific
 template <class TShard>
 class TExtendedTransactionBase: public NTabletFlatExecutor::TTransactionBase<TShard> {
 private:
@@ -32,4 +33,4 @@ class TExtendedTransactionBase: public NTabletFlatExecutor::TTransactionBase<TSh
     }
 };
 
-}
+} //namespace NKikimr::NColumnShard
diff --git a/ydb/core/tx/columnshard/tablet/ya.make b/ydb/core/tx/columnshard/tablet/ya.make
@@ -1,6 +1,7 @@
 LIBRARY()
 
 SRCS(
+    ext_tx_base.h
     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
@@ -3,7 +3,7 @@
 #include "sync.h"
 
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 
 #include <util/string/join.h>
 
@@ -77,9 +77,9 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
     virtual TString DoDebugString() const override {
         return "EV_WRITE_PRIMARY";
     }
-    class TTxWriteReceivedBrokenFlag: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedBrokenFlag: public TExtendedTransactionBase<TColumnShard> {
     private:
-        using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase<TColumnShard>;
         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 NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedResultAck: public TExtendedTransactionBase<TColumnShard> {
     private:
-        using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase<TColumnShard>;
         const ui64 TxId;
         const ui64 TabletId;
 
@@ -222,9 +222,9 @@ class TEvWriteCommitPrimaryTransactionOperator: public TEvWriteCommitSyncTransac
         CheckFinished(owner);
     }
 
-    class TTxStartPreparation: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+    class TTxStartPreparation: public TExtendedTransactionBase<TColumnShard> {
     private:
-        using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase<TColumnShard>;
         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
@@ -3,7 +3,7 @@
 #include "sync.h"
 
 #include <ydb/core/tx/columnshard/columnshard_impl.h>
-#include <ydb/core/tx/columnshard/data_sharing/common/transactions/tx_extension.h>
+#include <ydb/core/tx/columnshard/tablet/ext_tx_base.h>
 
 namespace NKikimr::NColumnShard {
 
@@ -58,9 +58,9 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
     virtual TString DoDebugString() const override {
         return "EV_WRITE_SECONDARY";
     }
-    class TTxWriteReceivedAck: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedAck: public TExtendedTransactionBase<TColumnShard> {
     private:
-        using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase<TColumnShard>;
         const ui64 TxId;
         bool NeedContinueFlag = false;
 
@@ -99,9 +99,9 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
         return std::make_unique<TTxWriteReceivedAck>(owner, GetTxId());
     }
 
-    class TTxWriteReceivedBrokenFlag: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+    class TTxWriteReceivedBrokenFlag: public TExtendedTransactionBase<TColumnShard> {
     private:
-        using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase<TColumnShard>;
         const ui64 TxId;
         const bool BrokenFlag;
 
@@ -170,9 +170,9 @@ class TEvWriteCommitSecondaryTransactionOperator: public TEvWriteCommitSyncTrans
         }
     }
 
-    class TTxStartPreparation: public NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard> {
+    class TTxStartPreparation: public TExtendedTransactionBase<TColumnShard> {
     private:
-        using TBase = NOlap::NDataSharing::TExtendedTransactionBase<TColumnShard>;
+        using TBase = TExtendedTransactionBase<TColumnShard>;
         const ui64 TxId;
 
         virtual bool DoExecute(NTabletFlatExecutor::TTransactionContext& txc, const NActors::TActorContext& /*ctx*/) override {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ LIBRARY()`
`2`	`2`
`3`	`3`	`PEERDIR(`
`4`	`4`	`ydb/core/tx/columnshard/data_sharing/common/session`
`5`		`- ydb/core/tx/columnshard/data_sharing/common/transactions`
`6`	`5`	`ydb/core/tx/columnshard/data_sharing/common/context`
`7`	`6`	`)`
`8`	`7`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ SRCS(`
`7`	`7`	`PEERDIR(`
`8`	`8`	`ydb/core/tx/columnshard/data_sharing/initiator/controller`
`9`	`9`	`ydb/core/tx/columnshard/data_sharing/common/session`
`10`		`- ydb/core/tx/columnshard/data_sharing/common/transactions`
	`10`	`+ ydb/core/tx/columnshard/tablet`
`11`	`11`	`ydb/core/tx/columnshard/data_sharing/destination/transactions`
`12`	`12`	`)`
`13`	`13`