commit

Author: stanislav-shchetinin

ydb/core/tx/datashard/export_common.cpp

@@ -90,5 +90,14 @@ TMaybe<Ydb::Scheme::ModifyPermissionsRequest> GenYdbPermissions(const NKikimrSch
     return permissions;
 }
 
+Ydb::Topic::DescribeTopicResult GenYdbTopic(const NKikimrSchemeOp::TPersQueueGroupDescription& persQueue) {
+
+    Ydb::Topic::DescribeTopicResult topic;
+
+    //topic.mutable_retention_period() = persQueue.get_
+
+    return topic;
+}
+
 } // NDataShard
 } // NKikimr

ydb/core/tx/schemeshard/schemeshard_export_flow_proposals.cpp

@@ -138,26 +138,20 @@ THolder<TEvSchemeShard::TEvModifySchemeTransaction> BackupPropose(
             FillSetValForSequences(
                 ss, *sourceDescription.MutableTable(), exportItemPath.Base()->PathId);
         }
-        auto forFiltered = [](const auto& list, NKikimrSchemeOp::EPathType type, auto func){
-            for (const auto& x : list) {
-                if (x.GetPathType() == type) {
-                    func(x);
+        auto cdcDesc = sourceDescription.GetTable().GetCdcStreams();
+        for (const auto& x : cdcDesc) {
+            TPathId pathId = {sourceDescription.GetTable().GetPathId().GetOwnerId(), x.GetPathId().GetLocalId()};
+            auto cdcPathDesc =  GetDescription(ss, pathId);
+            for (const auto& child : cdcPathDesc.GetChildren()) {
+                if (child.GetPathType() == NKikimrSchemeOp::EPathTypePersQueueGroup) {
+                    TPathId pathId = {child.GetParentPathId(), child.GetPathId()};
+                    ::NKikimrSchemeOp::TPathDescription* newPersQueue = task.MutablePersQueue()->Add();
+                    *newPersQueue = GetDescription(ss, pathId);
                 }
             }
-        };
-        forFiltered(sourceDescription.GetChildren(), NKikimrSchemeOp::EPathTypeCdcStream, 
-            [&ss, &forFiltered, &task](auto x){
-                TPathId pathId = {x.GetSchemeshardId(), x.GetPathId()};
-                auto desc = GetDescription(ss, pathId);
-                forFiltered(desc.GetChildren(), NKikimrSchemeOp::EPathTypePersQueueGroup, 
-                    [&ss, &task](auto y){
-                        TPathId pathId = {y.GetSchemeshardId(), y.GetPathId()};
-                        ::NKikimrSchemeOp::TPathDescription* newPersQueue = task.MutablePersQueue()->Add();
-                        *newPersQueue = GetDescription(ss, pathId);
-                    }
-                );
-            }
-        );
+        }
+        
+        Cerr << "tsz: " << task.GetPersQueue().size() << Endl;
         task.MutableTable()->CopyFrom(sourceDescription);
     }