(refactoring) Generic base classes for ydb_proxy & scheme results (#4687)

Author: CyberROFL

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

@@ -43,95 +43,30 @@ TString TEvPrivate::TEvAssignStreamName::ToString() const {
     << " }";
 }
 
-TEvPrivate::TEvCreateStreamResult::TEvCreateStreamResult(ui64 rid, ui64 tid, NYdb::TStatus&& status)
-    : ReplicationId(rid)
-    , TargetId(tid)
-    , Status(std::move(status))
-{
-}
-
-TString TEvPrivate::TEvCreateStreamResult::ToString() const {
-    return TStringBuilder() << ToStringHeader() << " {"
-        << " ReplicationId: " << ReplicationId
-        << " TargetId: " << TargetId
-        << " Status: " << Status.GetStatus()
-        << " Issues: " << Status.GetIssues().ToOneLineString()
-    << " }";
-}
-
-bool TEvPrivate::TEvCreateStreamResult::IsSuccess() const {
-    return Status.IsSuccess();
-}
-
 TEvPrivate::TEvCreateDstResult::TEvCreateDstResult(ui64 rid, ui64 tid, const TPathId& dstPathId)
-    : ReplicationId(rid)
-    , TargetId(tid)
+    : TBase(rid, tid, NKikimrScheme::StatusSuccess)
     , DstPathId(dstPathId)
-    , Status(NKikimrScheme::StatusSuccess)
 {
 }
 
 TEvPrivate::TEvCreateDstResult::TEvCreateDstResult(ui64 rid, ui64 tid, NKikimrScheme::EStatus status, const TString& error)
-    : ReplicationId(rid)
-    , TargetId(tid)
-    , Status(status)
-    , Error(error)
+    : TBase(rid, tid, status, error)
 {
 }
 
 TString TEvPrivate::TEvCreateDstResult::ToString() const {
-    return TStringBuilder() << ToStringHeader() << " {"
-        << " ReplicationId: " << ReplicationId
-        << " TargetId: " << TargetId
+    return TStringBuilder() << ToStringHeader() << " {" << ToStringBody()
         << " DstPathId: " << DstPathId
-        << " Status: " << NKikimrScheme::EStatus_Name(Status)
-        << " Error: " << Error
     << " }";
 }
 
-bool TEvPrivate::TEvCreateDstResult::IsSuccess() const {
-    return Status == NKikimrScheme::StatusSuccess;
-}
-
-TEvPrivate::TEvDropStreamResult::TEvDropStreamResult(ui64 rid, ui64 tid, NYdb::TStatus&& status)
-    : ReplicationId(rid)
-    , TargetId(tid)
-    , Status(std::move(status))
-{
-}
-
-TString TEvPrivate::TEvDropStreamResult::ToString() const {
-    return TStringBuilder() << ToStringHeader() << " {"
-        << " ReplicationId: " << ReplicationId
-        << " TargetId: " << TargetId
-        << " Status: " << Status.GetStatus()
-        << " Issues: " << Status.GetIssues().ToOneLineString()
-    << " }";
-}
-
-bool TEvPrivate::TEvDropStreamResult::IsSuccess() const {
-    return Status.IsSuccess();
-}
-
 TEvPrivate::TEvDropDstResult::TEvDropDstResult(ui64 rid, ui64 tid, NKikimrScheme::EStatus status, const TString& error)
-    : ReplicationId(rid)
-    , TargetId(tid)
-    , Status(status)
-    , Error(error)
+    : TBase(rid, tid, status, error)
 {
 }
 
 TString TEvPrivate::TEvDropDstResult::ToString() const {
-    return TStringBuilder() << ToStringHeader() << " {"
-        << " ReplicationId: " << ReplicationId
-        << " TargetId: " << TargetId
-        << " Status: " << NKikimrScheme::EStatus_Name(Status)
-        << " Error: " << Error
-    << " }";
-}
-
-bool TEvPrivate::TEvDropDstResult::IsSuccess() const {
-    return Status == NKikimrScheme::StatusSuccess;
+    return TStringBuilder() << ToStringHeader() << " {" << ToStringBody() << " }";
 }
 
 TEvPrivate::TEvDropReplication::TEvDropReplication(ui64 rid)

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

@@ -52,53 +52,85 @@ struct TEvPrivate {
         TString ToString() const override;
     };
 
-    struct TEvCreateStreamResult: public TEventLocal<TEvCreateStreamResult, EvCreateStreamResult> {
+    template <typename TDerived, ui32 EventType>
+    struct TGenericYdbProxyResult: public TEventLocal<TDerived, EventType> {
+        using TBase = TGenericYdbProxyResult<TDerived, EventType>;
+
         const ui64 ReplicationId;
         const ui64 TargetId;
         const NYdb::TStatus Status;
 
-        explicit TEvCreateStreamResult(ui64 rid, ui64 tid, NYdb::TStatus&& status);
-        TString ToString() const override;
+        explicit TGenericYdbProxyResult(ui64 rid, ui64 tid, NYdb::TStatus&& status)
+            : ReplicationId(rid)
+            , TargetId(tid)
+            , Status(std::move(status))
+        {
+        }
+
+        TString ToString() const override {
+            return TStringBuilder() << this->ToStringHeader() << " {"
+                << " ReplicationId: " << ReplicationId
+                << " TargetId: " << TargetId
+                << " Status: " << Status.GetStatus()
+                << " Issues: " << Status.GetIssues().ToOneLineString()
+            << " }";
+        }
+
+        bool IsSuccess() const {
+            return Status.IsSuccess();
+        }
+    };
 
-        bool IsSuccess() const;
+    struct TEvCreateStreamResult: public TGenericYdbProxyResult<TEvCreateStreamResult, EvCreateStreamResult> {
+        using TBase::TBase;
     };
 
-    struct TEvCreateDstResult: public TEventLocal<TEvCreateDstResult, EvCreateDstResult> {
+    struct TEvDropStreamResult: public TGenericYdbProxyResult<TEvDropStreamResult, EvDropStreamResult> {
+        using TBase::TBase;
+    };
+
+    template <typename TDerived, ui32 EventType>
+    struct TGenericSchemeResult: public TEventLocal<TDerived, EventType> {
+        using TBase = TGenericSchemeResult<TDerived, EventType>;
+
         const ui64 ReplicationId;
         const ui64 TargetId;
-        const TPathId DstPathId;
         const NKikimrScheme::EStatus Status;
         const TString Error;
 
-        explicit TEvCreateDstResult(ui64 rid, ui64 tid, const TPathId& dstPathId);
-        explicit TEvCreateDstResult(ui64 rid, ui64 tid, NKikimrScheme::EStatus status, const TString& error);
-        TString ToString() const override;
-
-        bool IsSuccess() const;
+        explicit TGenericSchemeResult(ui64 rid, ui64 tid, NKikimrScheme::EStatus status, const TString& error = {})
+            : ReplicationId(rid)
+            , TargetId(tid)
+            , Status(status)
+            , Error(error)
+        {
+        }
+
+        TString ToStringBody() const {
+            return TStringBuilder()
+                << " ReplicationId: " << ReplicationId
+                << " TargetId: " << TargetId
+                << " Status: " << NKikimrScheme::EStatus_Name(Status)
+                << " Error: " << Error;
+        }
+
+        bool IsSuccess() const {
+            return Status == NKikimrScheme::StatusSuccess;
+        }
     };
 
-    struct TEvDropStreamResult: public TEventLocal<TEvDropStreamResult, EvDropStreamResult> {
-        const ui64 ReplicationId;
-        const ui64 TargetId;
-        const NYdb::TStatus Status;
+    struct TEvCreateDstResult: public TGenericSchemeResult<TEvCreateDstResult, EvCreateDstResult> {
+        const TPathId DstPathId;
 
-        explicit TEvDropStreamResult(ui64 rid, ui64 tid, NYdb::TStatus&& status);
+        explicit TEvCreateDstResult(ui64 rid, ui64 tid, const TPathId& dstPathId);
+        explicit TEvCreateDstResult(ui64 rid, ui64 tid, NKikimrScheme::EStatus status, const TString& error);
         TString ToString() const override;
-
-        bool IsSuccess() const;
     };
 
-    struct TEvDropDstResult: public TEventLocal<TEvDropDstResult, EvDropDstResult> {
-        const ui64 ReplicationId;
-        const ui64 TargetId;
-        const NKikimrScheme::EStatus Status;
-        const TString Error;
-
+    struct TEvDropDstResult: public TGenericSchemeResult<TEvDropDstResult, EvDropDstResult> {
         explicit TEvDropDstResult(ui64 rid, ui64 tid,
             NKikimrScheme::EStatus status = NKikimrScheme::StatusSuccess, const TString& error = {});
         TString ToString() const override;
-
-        bool IsSuccess() const;
     };
 
     struct TEvDropReplication: public TEventLocal<TEvDropReplication, EvDropReplication> {