fix after merge

Author: niksaveliev

ydb/core/persqueue/partition.cpp

@@ -2100,7 +2100,7 @@ TPartition::EProcessResult TPartition::BeginTransaction(const TEvPQ::TEvTxCalcPr
         bool isAffectedConsumer = AffectedUsers.contains(consumer);
         TUserInfoBase& userInfo = GetOrCreatePendingUser(consumer);
 
-        if (!operation.GetReadSessionId().Empty() && operation.GetReadSessionId() != userInfo.Session) {
+        if (!operation.GetReadSessionId().empty() && operation.GetReadSessionId() != userInfo.Session) {
             PQ_LOG_D("Partition " << Partition <<
                 " Consumer '" << consumer << "'" <<
                 " Bad request (session already dead) " <<

ydb/core/persqueue/read_balancer_app.cpp

@@ -77,7 +77,7 @@ TString TPersQueueReadBalancer::GenerateStat() {
                         for (auto& [partitionId, partitionInfo] : PartitionsInfo) {
                             const auto& stats = AggregatedStats.Stats[partitionId];
                             const auto* node = PartitionGraph.GetPartition(partitionId);
-                            TString style = node && node->Children.empty() ? "text-success" : "text-muted";
+                            TString style = node && node->DirectChildren.empty() ? "text-success" : "text-muted";
 
                             TABLER() {
                                 TABLED() {
@@ -87,7 +87,7 @@ TString TPersQueueReadBalancer::GenerateStat() {
                                 }
                                 TABLED() {
                                     if (node) {
-                                        str << (node->Children.empty() ? "Active" : "Inactive");
+                                        str << (node->DirectChildren.empty() ? "Active" : "Inactive");
                                         if (node->IsRoot()) {
                                             str << " (root)";
                                         }
@@ -96,15 +96,15 @@ TString TPersQueueReadBalancer::GenerateStat() {
                                 TABLED() { HREF(TStringBuilder() << "?TabletID=" << partitionInfo.TabletId) { str << partitionInfo.TabletId; } }
                                 TABLED() {
                                     if (node) {
-                                        for (auto* parent : node->Parents) {
+                                        for (auto* parent : node->DirectParents) {
                                             HREF("#" + partitionAnchor(parent->Id)) { str << parent->Id; }
                                             str << ", ";
                                         }
                                     }
                                 }
                                 TABLED() {
                                     if (node) {
-                                        for (auto* child : node->Children) {
+                                        for (auto* child : node->DirectChildren) {
                                             HREF("#" + partitionAnchor(child->Id)) { str << child->Id; }
                                             str << ", ";
                                         }

ydb/services/persqueue_v1/actors/partition_actor.cpp

@@ -24,7 +24,7 @@ TPartitionActor::TPartitionActor(
         const TActorId& parentId, const TString& clientId, const TString& clientPath, const ui64 cookie,
         const TString& session, const TPartitionId& partition, const ui32 generation, const ui32 step,
         const ui64 tabletID, const TTopicCounters& counters, bool commitsDisabled,
-        const TString& clientDC, bool rangesMode, const NPersQueue::TTopicConverterPtr& topic,
+        const TString& clientDC, bool rangesMode, const NPersQueue::TTopicConverterPtr& topic, const TString& database,
         bool directRead, bool useMigrationProtocol, ui32 maxTimeLagMs, ui64 readTimestampMs, std::set<NPQ::TPartitionGraph::Node*> parents,
         std::unordered_set<ui64> notCommitedToFinishParents
 )

ydb/services/persqueue_v1/actors/partition_actor.h

@@ -75,7 +75,7 @@ class TPartitionActor : public NActors::TActorBootstrapped<TPartitionActor> {
      TPartitionActor(const TActorId& parentId, const TString& clientId, const TString& clientPath, const ui64 cookie,
                      const TString& session, const TPartitionId& partition, ui32 generation, ui32 step,
                      const ui64 tabletID, const TTopicCounters& counters, const bool commitsDisabled,
-                     const TString& clientDC, bool rangesMode, const NPersQueue::TTopicConverterPtr& topic, bool directRead,
+                     const TString& clientDC, bool rangesMode, const NPersQueue::TTopicConverterPtr& topic, const TString& database, bool directRead,
                      bool useMigrationProtocol, ui32 maxTimeLagMs, ui64 readTimestampMs, std::set<NPQ::TPartitionGraph::Node*> parents,
                      std::unordered_set<ui64> notCommitedToFinishParents);
     ~TPartitionActor();

ydb/services/persqueue_v1/actors/read_session_actor.cpp

@@ -1254,7 +1254,7 @@ void TReadSessionActor<UseMigrationProtocol>::Handle(TEvPersQueue::TEvLockPartit
     const TActorId actorId = ctx.Register(new TPartitionActor(
         ctx.SelfID, ClientId, ClientPath, Cookie, Session, partitionId, record.GetGeneration(),
         record.GetStep(), record.GetTabletId(), it->second, CommitsDisabled, ClientDC, RangesMode,
-        converterIter->second, DirectRead, UseMigrationProtocol, maxLag, readTimestampMs, topic.PartitionGraph->GetPartition(partitionId.Partition)->HierarhicalParents, notCommitedToFinishParents));
+        converterIter->second, Request->GetDatabaseName().GetOrElse(AppData(ctx)->PQConfig.GetDatabase()), DirectRead, UseMigrationProtocol, maxLag, readTimestampMs, topic.PartitionGraph->GetPartition(partitionId.Partition)->AllParents, notCommitedToFinishParents));
 
     if (SessionsActive) {
         PartsPerSession.DecFor(Partitions.size(), 1);