Separate build columns actor activity (#7260)

Author: MBkkt

ydb/core/tx/datashard/build_index.cpp

@@ -223,7 +223,11 @@ class TBufferData: public IStatHolder, public TNonCopyable {
     TSerializedCellVec LastKey;
 };
 
-class TBuildScanUpload: public TActor<TBuildScanUpload>, public NTable::IScan {
+template <NKikimrServices::TActivity::EType Activity>
+class TBuildScanUpload: public TActor<TBuildScanUpload<Activity>>, public NTable::IScan {
+    using TThis = TBuildScanUpload<Activity>;
+    using TBase = TActor<TThis>;
+
 protected:
     const TUploadLimits Limits;
 
@@ -264,7 +268,7 @@ class TBuildScanUpload: public TActor<TBuildScanUpload>, public NTable::IScan {
                      const TSerializedTableRange& range,
                      const TUserTable& tableInfo,
                      TUploadLimits limits)
-        : TActor(&TThis::StateWork)
+        : TBase(&TThis::StateWork)
         , Limits(limits)
         , BuildIndexId(buildIndexId)
         , TargetTable(target)
@@ -300,8 +304,8 @@ class TBuildScanUpload: public TActor<TBuildScanUpload>, public NTable::IScan {
     }
 
 public:
-    static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
-        return NKikimrServices::TActivity::BUILD_INDEX_SCAN_ACTOR;
+    static constexpr auto ActorActivityType() {
+        return Activity;
     }
 
     ~TBuildScanUpload() override = default;
@@ -354,7 +358,7 @@ class TBuildScanUpload: public TActor<TBuildScanUpload>, public NTable::IScan {
     }
 
     TAutoPtr<IDestructable> Finish(EAbort abort) noexcept override {
-        auto ctx = TActivationContext::AsActorContext().MakeFor(SelfId());
+        auto ctx = TActivationContext::AsActorContext().MakeFor(TBase::SelfId());
 
         if (Uploader) {
             TAutoPtr<TEvents::TEvPoisonPill> poison = new TEvents::TEvPoisonPill;
@@ -386,7 +390,7 @@ class TBuildScanUpload: public TActor<TBuildScanUpload>, public NTable::IScan {
         LOG_D("Finish " << Debug());
 
         Driver = nullptr;
-        PassAway();
+        this->PassAway();
         return nullptr;
     }
 
@@ -519,17 +523,17 @@ class TBuildScanUpload: public TActor<TBuildScanUpload>, public NTable::IScan {
         LOG_D("Upload, last key " << DebugPrintPoint(KeyTypes, WriteBuf.GetLastKey().GetCells(), *AppData()->TypeRegistry) << " " << Debug());
 
         auto actor = NTxProxy::CreateUploadRowsInternal(
-            SelfId(), TargetTable,
+            TBase::SelfId(), TargetTable,
             UploadColumnsTypes,
             WriteBuf.GetRowsData(),
             UploadMode,
             true /*writeToPrivateTable*/);
 
-        Uploader = TActivationContext::AsActorContext().MakeFor(SelfId()).Register(actor);
+        Uploader = TActivationContext::AsActorContext().MakeFor(TBase::SelfId()).Register(actor);
     }
 };
 
-class TBuildIndexScan final: public TBuildScanUpload {
+class TBuildIndexScan final: public TBuildScanUpload<NKikimrServices::TActivity::BUILD_INDEX_SCAN_ACTOR> {
     const ui32 TargetDataColumnPos; // positon of first data column in target table
 
 public:
@@ -563,7 +567,7 @@ class TBuildIndexScan final: public TBuildScanUpload {
     }
 };
 
-class TBuildColumnsScan final: public TBuildScanUpload {
+class TBuildColumnsScan final: public TBuildScanUpload<NKikimrServices::TActivity::BUILD_COLUMNS_SCAN_ACTOR> {
     TString ValueSerialized;
 
 public:

ydb/library/services/services.proto

@@ -1046,5 +1046,6 @@ message TActivity {
         REPLICATION_CONTROLLER_TARGET_DESCRIBER = 642;
         SAMPLE_K_SCAN_ACTOR = 643;
         MEMORY_CONTROLLER = 644;
+        BUILD_COLUMNS_SCAN_ACTOR = 645;
     };
 };