(refactoring) Pass replication object to Progress() instead of a bunch of arguments (#2766)

Author: CyberROFL

ydb/core/tx/replication/controller/replication.cpp

@@ -51,9 +51,9 @@ class TReplication::TImpl {
         }
     }
 
-    void ProgressTargets(const TActorContext& ctx) {
+    void ProgressTargets(TReplication::TPtr self, const TActorContext& ctx) {
         for (auto& [_, target] : Targets) {
-            target->Progress(PathId.OwnerId, YdbProxy, ctx);
+            target->Progress(self, ctx);
         }
     }
 
@@ -89,7 +89,7 @@ class TReplication::TImpl {
         Targets.erase(id);
     }
 
-    void Progress(const TActorContext& ctx) {
+    void Progress(TReplication::TPtr self, const TActorContext& ctx) {
         if (!YdbProxy) {
             THolder<IActor> ydbProxy;
             switch (Config.GetCredentialsCase()) {
@@ -118,13 +118,13 @@ class TReplication::TImpl {
             if (!Targets) {
                 return DiscoverTargets(ctx);
             } else {
-                return ProgressTargets(ctx);
+                return ProgressTargets(self, ctx);
             }
         case EState::Removing:
             if (!Targets) {
                 return (void)ctx.Send(ctx.SelfID, new TEvPrivate::TEvDropReplication(ReplicationId));
             } else {
-                return ProgressTargets(ctx);
+                return ProgressTargets(self, ctx);
             }
         case EState::Error:
             return;
@@ -211,7 +211,7 @@ void TReplication::RemoveTarget(ui64 id) {
 }
 
 void TReplication::Progress(const TActorContext& ctx) {
-    Impl->Progress(ctx);
+    Impl->Progress(this, ctx);
 }
 
 void TReplication::Shutdown(const TActorContext& ctx) {
@@ -226,6 +226,10 @@ const TPathId& TReplication::GetPathId() const {
     return Impl->PathId;
 }
 
+const TActorId& TReplication::GetYdbProxy() const {
+    return Impl->YdbProxy;
+}
+
 void TReplication::SetState(EState state, TString issue) {
     Impl->SetState(state, issue);
 }

ydb/core/tx/replication/controller/replication.h

@@ -68,7 +68,7 @@ class TReplication: public TSimpleRefCount<TReplication> {
         virtual const TString& GetIssue() const = 0;
         virtual void SetIssue(const TString& value) = 0;
 
-        virtual void Progress(ui64 schemeShardId, const TActorId& proxy, const TActorContext& ctx) = 0;
+        virtual void Progress(TReplication::TPtr replication, const TActorContext& ctx) = 0;
         virtual void Shutdown(const TActorContext& ctx) = 0;
     };
 
@@ -93,6 +93,7 @@ class TReplication: public TSimpleRefCount<TReplication> {
 
     ui64 GetId() const;
     const TPathId& GetPathId() const;
+    const TActorId& GetYdbProxy() const;
     void SetState(EState state, TString issue = {});
     EState GetState() const;
     const TString& GetIssue() const;

ydb/core/tx/replication/controller/target_base.cpp

@@ -81,7 +81,10 @@ ETargetKind TTargetBase::GetTargetKind() const {
     return Kind;
 }
 
-void TTargetBase::Progress(ui64 schemeShardId, const TActorId& proxy, const TActorContext& ctx) {
+void TTargetBase::Progress(TReplication::TPtr replication, const TActorContext& ctx) {
+    const auto schemeShardId = replication->GetPathId().OwnerId;
+    const auto& proxy = replication->GetYdbProxy();
+
     switch (DstState) {
     case EDstState::Creating:
         if (!DstCreator) {

ydb/core/tx/replication/controller/target_base.h

@@ -31,7 +31,7 @@ class TTargetBase: public TReplication::ITarget {
     const TString& GetIssue() const override;
     void SetIssue(const TString& value) override;
 
-    void Progress(ui64 schemeShardId, const TActorId& proxy, const TActorContext& ctx) override;
+    void Progress(TReplication::TPtr replication, const TActorContext& ctx) override;
     void Shutdown(const TActorContext& ctx) override;
 
 protected:

ydb/core/tx/replication/controller/target_with_stream.cpp

@@ -9,7 +9,9 @@ namespace NKikimr::NReplication::NController {
 
 const TString ReplicationConsumerName = "replicationConsumer";
 
-void TTargetWithStream::Progress(ui64 schemeShardId, const TActorId& proxy, const TActorContext& ctx) {
+void TTargetWithStream::Progress(TReplication::TPtr replication, const TActorContext& ctx) {
+    const auto& proxy = replication->GetYdbProxy();
+
     switch (GetStreamState()) {
     case EStreamState::Creating:
         if (GetStreamName().empty() && !NameAssignmentInProcess) {
@@ -32,7 +34,7 @@ void TTargetWithStream::Progress(ui64 schemeShardId, const TActorId& proxy, cons
         break;
     }
 
-    TTargetBase::Progress(schemeShardId, proxy, ctx);
+    TTargetBase::Progress(replication, ctx);
 }
 
 void TTargetWithStream::Shutdown(const TActorContext& ctx) {

ydb/core/tx/replication/controller/target_with_stream.h

@@ -15,7 +15,7 @@ class TTargetWithStream: public TTargetBase {
         SetStreamState(EStreamState::Creating);
     }
 
-    void Progress(ui64 schemeShardId, const TActorId& proxy, const TActorContext& ctx) override;
+    void Progress(TReplication::TPtr replication, const TActorContext& ctx) override;
     void Shutdown(const TActorContext& ctx) override;
 
 private: