Get rid of TChangeRecordBuilderTrait (#9164)

Author: CyberROFL

ydb/core/backup/impl/table_writer_impl.h

@@ -31,11 +31,15 @@ struct TChangeRecordBuilderContextTrait<NBackup::NImpl::TChangeRecord> {
 
 namespace NKikimr::NBackup::NImpl {
 
+class TChangeRecordBuilder;
+
 class TChangeRecord: public NChangeExchange::TChangeRecordBase {
     friend class TChangeRecordBuilder;
 
 public:
     using TPtr = TIntrusivePtr<TChangeRecord>;
+    using TBuilder = TChangeRecordBuilder;
+
     const static NKikimrSchemeOp::ECdcStreamFormat StreamType = NKikimrSchemeOp::ECdcStreamFormatProto;
 
     ui64 GetGroup() const override {
@@ -197,9 +201,4 @@ struct TChangeRecordContainer<NBackup::NImpl::TChangeRecord>
     using TBaseChangeRecordContainer<NBackup::NImpl::TChangeRecord>::TBaseChangeRecordContainer;
 };
 
-template <>
-struct TChangeRecordBuilderTrait<NBackup::NImpl::TChangeRecord>
-    : public NBackup::NImpl::TChangeRecordBuilder
-{};
-
 }

ydb/core/change_exchange/change_record.h

@@ -6,9 +6,6 @@
 
 namespace NKikimr {
 
-template <typename TChangeRecord>
-struct TChangeRecordBuilderTrait;
-
 template <typename TChangeRecord>
 struct TChangeRecordBuilderContextTrait {};
 

ydb/core/tx/replication/service/json_change_record.h

@@ -31,6 +31,7 @@ class TChangeRecord: public NChangeExchange::TChangeRecordBase {
 
 public:
     using TPtr = TIntrusivePtr<TChangeRecord>;
+    using TBuilder = TChangeRecordBuilder;
 
     const static NKikimrSchemeOp::ECdcStreamFormat StreamType = NKikimrSchemeOp::ECdcStreamFormatJson;
 
@@ -88,11 +89,6 @@ struct TChangeRecordContainer<NReplication::NService::TChangeRecord>
     using TBaseChangeRecordContainer<NReplication::NService::TChangeRecord>::TBaseChangeRecordContainer;
 };
 
-template <>
-struct TChangeRecordBuilderTrait<NReplication::NService::TChangeRecord>
-    : public NReplication::NService::TChangeRecordBuilder
-{};
-
 template <>
 struct TChangeRecordBuilderContextTrait<NReplication::NService::TChangeRecord> {
     TMemoryPool MemoryPool;

ydb/core/tx/replication/service/table_writer_impl.h

@@ -450,7 +450,7 @@ class TLocalTableWriter
 
         for (auto& record : ev->Get()->Records) {
             records.emplace_back(record.Offset, TablePathId, record.Data.size());
-            auto res = PendingRecords.emplace(record.Offset, TChangeRecordBuilderTrait<TChangeRecord>()
+            auto res = PendingRecords.emplace(record.Offset, typename TChangeRecord::TBuilder()
                 .WithSourceId(ev->Get()->Source)
                 .WithOrder(record.Offset)
                 .WithBody(std::move(record.Data))