Little refactoring (#5710)

Author: CyberROFL

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

@@ -1,9 +1,7 @@
 #include "json_change_record.h"
 
-#include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/io_formats/cell_maker/cell_maker.h>
-
-#include <util/memory/pool.h>
+#include <ydb/core/protos/tx_datashard.pb.h>
 
 namespace NKikimr::NReplication::NService {
 
@@ -71,10 +69,7 @@ static bool ParseValue(TVector<NTable::TTag>& tags, TVector<TCell>& cells,
     return true;
 }
 
-void TChangeRecord::Serialize(
-    NKikimrTxDataShard::TEvApplyReplicationChanges::TChange& record,
-    TChangeRecordBuilderContextTrait<NReplication::NService::TChangeRecord>& ctx) const
-{
+void TChangeRecord::Serialize(NKikimrTxDataShard::TEvApplyReplicationChanges_TChange& record, TSerializationContext& ctx) const {
     auto& pool = ctx.MemoryPool;
     pool.Clear();
     record.SetSourceOffset(GetOrder());
@@ -112,8 +107,8 @@ void TChangeRecord::Serialize(
     }
 }
 
-void TChangeRecord::Serialize(NKikimrTxDataShard::TEvApplyReplicationChanges::TChange& record) const {
-    TChangeRecordBuilderContextTrait<NReplication::NService::TChangeRecord> ctx;
+void TChangeRecord::Serialize(NKikimrTxDataShard::TEvApplyReplicationChanges_TChange& record) const {
+    TSerializationContext ctx;
     Serialize(record, ctx);
 }
 

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

@@ -5,28 +5,33 @@
 #include <ydb/core/change_exchange/change_exchange.h>
 #include <ydb/core/change_exchange/change_record.h>
 #include <ydb/core/change_exchange/change_sender_resolver.h>
-#include <ydb/core/protos/tx_datashard.pb.h>
 #include <ydb/core/scheme/scheme_tablecell.h>
 #include <ydb/core/scheme_types/scheme_type_info.h>
 #include <ydb/core/tablet_flat/flat_row_eggs.h>
 
 #include <library/cpp/json/json_reader.h>
 
-#include <util/generic/hash.h>
 #include <util/generic/maybe.h>
 #include <util/generic/ptr.h>
 #include <util/generic/vector.h>
 #include <util/memory/pool.h>
 #include <util/string/join.h>
 
+namespace NKikimrTxDataShard {
+    class TEvApplyReplicationChanges_TChange;
+}
+
 namespace NKikimr::NReplication::NService {
 
 class TChangeRecordBuilder;
 
 class TChangeRecord: public NChangeExchange::TChangeRecordBase {
     friend class TChangeRecordBuilder;
+    using TSerializationContext = TChangeRecordBuilderContextTrait<TChangeRecord>;
 
 public:
+    using TPtr = TIntrusivePtr<TChangeRecord>;
+
     const static NKikimrSchemeOp::ECdcStreamFormat StreamType = NKikimrSchemeOp::ECdcStreamFormatJson;
 
     ui64 GetGroup() const override;
@@ -35,10 +40,8 @@ class TChangeRecord: public NChangeExchange::TChangeRecordBase {
     EKind GetKind() const override;
     TString GetSourceId() const;
 
-    void Serialize(
-        NKikimrTxDataShard::TEvApplyReplicationChanges::TChange& record,
-        TChangeRecordBuilderContextTrait<NReplication::NService::TChangeRecord>& ctx) const;
-    void Serialize(NKikimrTxDataShard::TEvApplyReplicationChanges::TChange& record) const;
+    void Serialize(NKikimrTxDataShard::TEvApplyReplicationChanges_TChange& record, TSerializationContext& ctx) const;
+    void Serialize(NKikimrTxDataShard::TEvApplyReplicationChanges_TChange& record) const;
 
     TConstArrayRef<TCell> GetKey(TMemoryPool& pool) const;
     TConstArrayRef<TCell> GetKey() const;
@@ -71,7 +74,6 @@ class TChangeRecord: public NChangeExchange::TChangeRecordBase {
         return it->ShardId;
     }
 
-    using TPtr = TIntrusivePtr<TChangeRecord>;
 private:
     TString SourceId;
     NJson::TJsonValue JsonBody;
@@ -118,7 +120,6 @@ struct TChangeRecordContainer<NReplication::NService::TChangeRecord>
         : Records(std::move(records))
     {}
 
-
     TVector<NReplication::NService::TChangeRecord::TPtr> Records;
 
     TString Out() override {