LOGBROKER-7220 Return cloud_id, folder_id, db_id

Return cloudId, dbId, folderId to ss common operation

ref:bf63a9a2b8809ed2be21d1a2111117db3eaab4f9

3 files changed, 26 insertions, 4 deletions

diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp
index f7a47459b97..9263fbc9298 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_alter_pq.cpp
@@ -142,18 +142,18 @@ public:
             const TPathElement::TPtr dbRootEl = context.SS->PathsById.at(context.SS->RootPathId());
             if (dbRootEl->UserAttrs->Attrs.contains("cloud_id")) {
                 auto cloudId = dbRootEl->UserAttrs->Attrs.at("cloud_id");
-                tabletConfig->SetYcCloudId(cloudId);
+                alterConfig.SetYcCloudId(cloudId);
             }
             if (dbRootEl->UserAttrs->Attrs.contains("folder_id")) {
                 auto folderId = dbRootEl->UserAttrs->Attrs.at("folder_id");
-                tabletConfig->SetYcFolderId(folderId);
+                alterConfig.SetYcFolderId(folderId);
             }
             if (dbRootEl->UserAttrs->Attrs.contains("database_id")) {
                 auto databaseId = dbRootEl->UserAttrs->Attrs.at("database_id");
-                tabletConfig->SetYdbDatabaseId(databaseId);
+                alterConfig.SetYdbDatabaseId(databaseId);
             }
             const TString databasePath = TPath::Init(context.SS->RootPathId(), context.SS).PathString();
-            tabletConfig->SetYdbDatabasePath(databasePath);
+            alterConfig.SetYdbDatabasePath(databasePath);
 
             alterConfig.MutablePartitionKeySchema()->Swap(tabletConfig->MutablePartitionKeySchema());
             Y_PROTOBUF_SUPPRESS_NODISCARD alterConfig.SerializeToString(&params->TabletConfig);
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_common.h b/ydb/core/tx/schemeshard/schemeshard__operation_common.h
index 5a3da32cade..8718978d538 100644
--- a/ydb/core/tx/schemeshard/schemeshard__operation_common.h
+++ b/ydb/core/tx/schemeshard/schemeshard__operation_common.h
@@ -996,6 +996,22 @@ public:
                 tabletConfig = &pqGroup->AlterData->TabletConfig;
         }
 
+        const TPathElement::TPtr dbRootEl = context.SS->PathsById.at(context.SS->RootPathId());
+        TString cloudId;
+        if (dbRootEl->UserAttrs->Attrs.contains("cloud_id")) {
+            cloudId = dbRootEl->UserAttrs->Attrs.at("cloud_id");
+        }
+        TString folderId;
+        if (dbRootEl->UserAttrs->Attrs.contains("folder_id")) {
+           folderId = dbRootEl->UserAttrs->Attrs.at("folder_id");
+        }
+        TString databaseId;
+        if (dbRootEl->UserAttrs->Attrs.contains("database_id")) {
+            databaseId = dbRootEl->UserAttrs->Attrs.at("database_id");
+        }
+
+        TString databasePath = TPath::Init(context.SS->RootPathId(), context.SS).PathString();
+
         for (auto shard : txState->Shards) {
             TShardIdx idx = shard.Idx;
             TTabletId tabletId = context.SS->ShardInfos.at(idx).TabletID;
@@ -1021,6 +1037,11 @@ public:
                 event->Record.MutableTabletConfig()->SetTopicPath(TPath::Init(txState->TargetPathId, context.SS).PathString());
                 event->Record.MutableTabletConfig()->MutablePartitionConfig()->SetTotalPartitions(pqGroup->AlterData ? pqGroup->AlterData->TotalGroupCount : pqGroup->TotalGroupCount);
 
+                event->Record.MutableTabletConfig()->SetYdbDatabaseId(databaseId);
+                event->Record.MutableTabletConfig()->SetYcCloudId(cloudId);
+                event->Record.MutableTabletConfig()->SetYcFolderId(folderId);
+                event->Record.MutableTabletConfig()->SetYdbDatabasePath(databasePath);
+
                 event->Record.MutableTabletConfig()->SetVersion(pqGroup->AlterVersion + 1);
 
                 for (const auto& pq : pqShard->PQInfos) {
diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp
index 30d9ab9b8ec..4c1fd4e8520 100644
--- a/ydb/services/persqueue_v1/persqueue_ut.cpp
+++ b/ydb/services/persqueue_v1/persqueue_ut.cpp
@@ -2562,6 +2562,7 @@ namespace {
       Codecs: "zstd"
     }
     ReadRuleVersions: 567
+    YdbDatabasePath: "/Root"
   }
   ErrorCode: OK
 }