fix paths

stanislav-shchetinin · Feb 19, 2025 · 76b50eb · 76b50eb
1 parent f50eccb
commit 76b50eb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/ydb/core/tx/schemeshard/schemeshard_import__create.cpp b/ydb/core/tx/schemeshard/schemeshard_import__create.cpp
@@ -1061,10 +1061,6 @@ struct TSchemeShard::TImport::TTxProgress: public TSchemeShard::TXxport::TTxBase
 
             case EState::CreateChangefeed:
                 CreateChangefeed(importInfo, i, txId);
-                itemIdx = i;
-                break;
-
-            case EState::CreateConsumers:
                 CreateConsumers(importInfo, i, txId);
                 itemIdx = i;
                 break;
@@ -1312,19 +1308,10 @@ struct TSchemeShard::TImport::TTxProgress: public TSchemeShard::TXxport::TTxBase
         case EState::CreateChangefeed:
             if (++item.NextChangefeedIdx < item.Changefeeds.GetChangefeeds().size()) {
                 AllocateTxId(importInfo, itemIdx);
-                item.State = EState::CreateConsumers;
             } else {
                 item.State = EState::Done;
             }
             break;
-
-        case EState::CreateConsumers:
-            if (item.NextChangefeedIdx < item.Changefeeds.GetChangefeeds().size()) {
-                AllocateTxId(importInfo, itemIdx);
-                item.State = EState::CreateChangefeed;
-            } else {
-                item.State = EState::Done;
-            }
 
         default:
             return SendNotificationsIfFinished(importInfo);

diff --git a/ydb/core/tx/schemeshard/schemeshard_import_flow_proposals.cpp b/ydb/core/tx/schemeshard/schemeshard_import_flow_proposals.cpp
@@ -308,10 +308,8 @@ THolder<TEvSchemeShard::TEvModifySchemeTransaction> CreateConsumersPropose(
     auto& pqGroup = *modifyScheme.MutableAlterPersQueueGroup();
 
     const TPath dstPath = TPath::Init(item.DstPathId, ss);
-    Cerr << "pqGroup working dir: " << dstPath.Parent().PathString() << Endl;
-    Cerr << "pqGroup name: " << dstPath.LeafName() << Endl;
-    modifyScheme.SetWorkingDir(dstPath.Parent().PathString());
-    pqGroup.SetName(dstPath.LeafName());
+    modifyScheme.SetWorkingDir(dstPath.PathString());
+    pqGroup.SetName(importChangefeedTopic.GetChangefeed().name());
 
     for (const auto& consumer : topic.consumers()) {
         auto pqConsumer = *pqGroup.MutablePQTabletConfig()->AddConsumers();

diff --git a/ydb/core/tx/schemeshard/schemeshard_info_types.h b/ydb/core/tx/schemeshard/schemeshard_info_types.h
@@ -2829,7 +2829,6 @@ struct TImportInfo: public TSimpleRefCount<TImportInfo> {
         Transferring,
         BuildIndexes,
         CreateChangefeed,
-        CreateConsumers,
         Done = 240,
         Cancellation = 250,
         Cancelled = 251,