schemeshard: refactor ISubOperationState::DebugReply() to template

2 files changed, 15 insertions, 11 deletions

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp
index 7cd1ffc8e8..ed2dbfc130 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_part.cpp
@@ -55,13 +55,20 @@ struct TDebugEvent<TEvPrivate::TEvUndoTenantUpdate> {
     }
 };
 
-#define DefaultDebugReply(TEvType, ...) \
-    TString ISubOperationState::DebugReply(TEvType::TPtr& ev) { \
-        return TDebugEvent<TEvType>::ToString(ev);              \
-    }
 
-    SCHEMESHARD_INCOMING_EVENTS(DefaultDebugReply)
-#undef DefaultDebugReply
+template <EventBasePtr TEvPtr>
+TString ISubOperationState::DebugReply(const TEvPtr& ev) {
+    using TEvType = typename EventTypeFromTEvPtr<TEvPtr>::type;
+    return TDebugEvent<TEvType>::ToString(ev);
+}
+
+
+#define DefineDebugReply(TEvType, ...) \
+    template TString ISubOperationState::DebugReply(const TEvType::TPtr& ev);
+
+    SCHEMESHARD_INCOMING_EVENTS(DefineDebugReply)
+#undef DefineDebugReply
+
 
 static TString LogMessage(const TString& ev, TOperationContext& context, bool ignore) {
     return TStringBuilder() << (ignore ? "Unexpected" : "Ignore") << " message"
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_part.h b/ydb/core/tx/schemeshard/schemeshard__operation_part.h
index 60c7e295cb..706a1fce24 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_part.h
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_part.h
@@ -163,11 +163,8 @@ class ISubOperationState {
 public:
     virtual ~ISubOperationState() = default;
 
-#define DefaultDebugReply(TEvType, TxType) \
-    static TString DebugReply(TEvType::TPtr& ev);
-
-    SCHEMESHARD_INCOMING_EVENTS(DefaultDebugReply)
-#undef DefaultDebugReply
+    template <EventBasePtr TEvPtr>
+    static TString DebugReply(const TEvPtr& ev);
 
 #define DefaultHandleReply(TEvType, ...) \
     virtual bool HandleReply(TEvType::TPtr& ev, TOperationContext& context);