Extract CreatePartitionActor method

2 files changed, 27 insertions, 18 deletions

diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp
index 78f8b6e927e..f8f8559d99e 100644
--- a/ydb/core/persqueue/pq_impl.cpp
+++ b/ydb/core/persqueue/pq_impl.cpp
@@ -623,9 +623,7 @@ void TPersQueue::ApplyNewConfigAndReply(const TActorContext& ctx)
         const auto partitionId = partition.GetPartitionId();
         if (Partitions.find(partitionId) == Partitions.end()) {
             Partitions.emplace(partitionId, TPartitionInfo(
-                ctx.Register(new TPartition(TabletID(), partitionId, ctx.SelfID, CacheActor, TopicConverter,
-                                            IsLocalDC, DCId, IsServerless, Config, *Counters, SubDomainOutOfSpace,
-                                            true)),
+                ctx.Register(CreatePartitionActor(partitionId, Config, true, ctx)),
                 GetPartitionKeyRange(partition),
                 true,
                 *Counters
@@ -787,9 +785,7 @@ void TPersQueue::ReadConfig(const NKikimrClient::TKeyValueResponse::TReadResult&
     for (const auto& partition : Config.GetPartitions()) { // no partitions will be created with empty config
         const auto partitionId = partition.GetPartitionId();
         Partitions.emplace(partitionId, TPartitionInfo(
-            ctx.Register(new TPartition(TabletID(), partitionId, ctx.SelfID, CacheActor, TopicConverter,
-                                        IsLocalDC, DCId, IsServerless, Config, *Counters, SubDomainOutOfSpace,
-                                        false)),
+            ctx.Register(CreatePartitionActor(partitionId, Config, false, ctx)),
             GetPartitionKeyRange(partition),
             false,
             *Counters
@@ -3061,6 +3057,25 @@ void TPersQueue::SendEvProposePartitionConfig(const TActorContext& ctx,
     tx.PartitionRepliesExpected = Partitions.size();
 }
 
+TPartition* TPersQueue::CreatePartitionActor(ui32 partitionId,
+                                             const NKikimrPQ::TPQTabletConfig& config,
+                                             bool newPartition,
+                                             const TActorContext& ctx)
+{
+    return new TPartition(TabletID(),
+                          partitionId,
+                          ctx.SelfID,
+                          CacheActor,
+                          TopicConverter,
+                          IsLocalDC,
+                          DCId,
+                          IsServerless,
+                          config,
+                          *Counters,
+                          SubDomainOutOfSpace,
+                          newPartition);
+}
+
 void TPersQueue::CreateNewPartitions(NKikimrPQ::TPQTabletConfig& config,
                                      const TActorContext& ctx)
 {
@@ -3080,18 +3095,7 @@ void TPersQueue::CreateNewPartitions(NKikimrPQ::TPQTabletConfig& config,
             continue;
         }
 
-        TActorId actorId = ctx.Register(new TPartition(TabletID(),
-                                                       partitionId,
-                                                       ctx.SelfID,
-                                                       CacheActor,
-                                                       TopicConverter,
-                                                       IsLocalDC,
-                                                       DCId,
-                                                       IsServerless,
-                                                       config,
-                                                       *Counters,
-                                                       SubDomainOutOfSpace,
-                                                       true));
+        TActorId actorId = ctx.Register(CreatePartitionActor(partitionId, config, true, ctx));
 
         Partitions.emplace(std::piecewise_construct,
                            std::forward_as_tuple(partitionId),
diff --git a/ydb/core/persqueue/pq_impl.h b/ydb/core/persqueue/pq_impl.h
index 487101ef892..569121c7f90 100644
--- a/ydb/core/persqueue/pq_impl.h
+++ b/ydb/core/persqueue/pq_impl.h
@@ -20,6 +20,7 @@ struct TPartitionInfo;
 struct TChangeNotification;
 
 class TResponseBuilder;
+class TPartition;
 
 //USES MAIN chanel for big blobs, INLINE or EXTRA for ZK-like load, EXTRA2 for small blob for logging (VDISK of type LOG is ok with EXTRA2)
 
@@ -294,6 +295,10 @@ private:
     void SendEvProposePartitionConfig(const TActorContext& ctx,
                                       TDistributedTransaction& tx);
 
+    TPartition* CreatePartitionActor(ui32 partitionId,
+                                     const NKikimrPQ::TPQTabletConfig& config,
+                                     bool newPartition,
+                                     const TActorContext& ctx);
     void CreateNewPartitions(NKikimrPQ::TPQTabletConfig& config,
                              const TActorContext& ctx);
     void EnsurePartitionsAreNotDeleted(const NKikimrPQ::TPQTabletConfig& config) const;