WIP

Author: Enjection

ydb/core/tx/datashard/datashard_ut_incremental_restore_scan.cpp

@@ -1,13 +1,40 @@
 #include "incr_restore_scan.h"
 
 #include <library/cpp/testing/unittest/registar.h>
+#include <ydb/core/testlib/test_client.h>
+#include <ydb/core/util/testactorsys.h>
 
-namespace NKikimr {
+namespace NKikimr::NDataShard {
 
 Y_UNIT_TEST_SUITE(IncrementalRestoreScan) {
     Y_UNIT_TEST(Simple) {
+        TPortManager pm;
+        Tests::TServerSettings serverSettings(pm.GetPort(2134));
+        serverSettings.SetDomainName("Root")
+            .SetUseRealThreads(false);
 
+        Tests::TServer::TPtr server = new Tests::TServer(serverSettings);
+        auto &runtime = *server->GetRuntime();
+        auto sender = runtime.AllocateEdgeActor();
+        auto sender2 = runtime.AllocateEdgeActor();
+
+        runtime.SetLogPriority(NKikimrServices::TX_DATASHARD, NLog::PRI_TRACE);
+        runtime.SetLogPriority(NKikimrServices::TX_PROXY, NLog::PRI_TRACE);
+
+        TUserTable::TCPtr table;
+        TPathId targetPathId{};
+        ui64 txId = 0;
+
+        auto scan = CreateIncrementalRestoreScan(
+            sender,
+            [&](const TActorContext&) {
+                return sender2;
+            },
+            TPathId{} /*sourcePathId*/,
+            table,
+            targetPathId,
+            txId);
     }
 }
 
-} // namespace NKikimr
+} // namespace NKikimr::NDataShard

ydb/core/tx/datashard/incr_restore_scan.cpp

@@ -41,7 +41,7 @@ class TIncrementalRestoreScan
 public:
     explicit TIncrementalRestoreScan(
             TActorId parent,
-            std::function<IActor*()> changeSenderFactory,
+            std::function<TActorId(const TActorContext& ctx)> changeSenderFactory,
             ui64 txId,
             const TPathId& sourcePathId,
             TUserTable::TCPtr table,
@@ -73,7 +73,7 @@ class TIncrementalRestoreScan
     }
 
     void Registered(TActorSystem*, const TActorId&) override {
-        ChangeSender = RegisterWithSameMailbox(ChangeSenderFactory());
+        ChangeSender = ChangeSenderFactory(TlsActivationContext->AsActorContext());
     }
 
     void PassAway() override {
@@ -177,7 +177,7 @@ class TIncrementalRestoreScan
     }
 
     TAutoPtr<IDestructable> Finish(EAbort abort) noexcept override {
-        LOG_D("Finish " << abort);
+        LOG_D("Finish " << static_cast<ui64>(abort));
 
         if (abort != EAbort::None) {
             Send(Parent, new TEvIncrementalRestoreScan::TEvFinished{});
@@ -240,7 +240,7 @@ class TIncrementalRestoreScan
 
 private:
     const TActorId Parent;
-    const std::function<IActor*()> ChangeSenderFactory;
+    const std::function<TActorId(const TActorContext& ctx)> ChangeSenderFactory;
     const ui64 TxId;
     const TPathId SourcePathId;
     const TPathId TargetPathId;
@@ -262,7 +262,7 @@ class TIncrementalRestoreScan
 
 THolder<NTable::IScan> CreateIncrementalRestoreScan(
         NActors::TActorId parent,
-        std::function<NActors::IActor*()> changeSenderFactory,
+        std::function<TActorId(const TActorContext& ctx)> changeSenderFactory,
         TPathId sourcePathId,
         TUserTable::TCPtr table,
         const TPathId& targetPathId,

ydb/core/tx/datashard/incr_restore_scan.h

@@ -28,7 +28,7 @@ struct TEvIncrementalRestoreScan {
 
 THolder<NTable::IScan> CreateIncrementalRestoreScan(
         NActors::TActorId parent,
-        std::function<NActors::IActor*()> changeSenderFactory,
+        std::function<TActorId(const TActorContext& ctx)> changeSenderFactory,
         TPathId tablePathId,
         TUserTable::TCPtr table,
         const TPathId& targetPathId,