move incrBackupImplTable one level above

ydb-platform · May 29, 2024 · 1bbeeb7 · 1bbeeb7
1 parent a904692
commit 1bbeeb7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/ydb/core/tx/schemeshard/schemeshard__operation_alter_continuous_backup.cpp b/ydb/core/tx/schemeshard/schemeshard__operation_alter_continuous_backup.cpp
@@ -70,7 +70,7 @@ TVector<ISubOperation::TPtr> CreateAlterContinuousBackup(TOperationId opId, cons
     const auto topicPath = streamPath.Child("streamImpl");
     TTopicInfo::TPtr topic = context.SS->Topics.at(topicPath.Base()->PathId);
 
-    const auto backupTablePath = streamPath.Child("incBackupImpl");
+    const auto backupTablePath = tablePath.Child("incBackupImpl");
 
     const NScheme::TTypeRegistry* typeRegistry = AppData(context.Ctx)->TypeRegistry;
 

diff --git a/ydb/core/tx/schemeshard/schemeshard_impl.cpp b/ydb/core/tx/schemeshard/schemeshard_impl.cpp
@@ -6693,6 +6693,11 @@ void TSchemeShard::FillTableDescriptionForShardIdx(
                 break;
             }
 
+            case NKikimrSchemeOp::EPathTypeTable: {
+                // TODO: move BackupImplTable under special scheme element
+                break;
+            }
+
             default:
                 Y_FAIL_S("Unexpected table's child"
                     << ": tableId# " << tableId

diff --git a/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp b/ydb/core/tx/schemeshard/schemeshard_path_describer.cpp
@@ -372,6 +372,9 @@ void TPathDescriber::DescribeTable(const TActorContext& ctx, TPathId pathId, TPa
         case NKikimrSchemeOp::EPathTypeSequence:
             Self->DescribeSequence(childPathId, childName, *entry->AddSequences(), returnSetVal);
             break;
+        case NKikimrSchemeOp::EPathTypeTable:
+            // TODO: move BackupImplTable under special scheme element
+            break;
         default:
             Y_FAIL_S("Unexpected table's child"
                 << ": tableId# " << pathId

diff --git a/ydb/core/tx/schemeshard/ut_continuous_backup/ut_continuous_backup.cpp b/ydb/core/tx/schemeshard/ut_continuous_backup/ut_continuous_backup.cpp
@@ -108,7 +108,7 @@ Y_UNIT_TEST_SUITE(TContinuousBackupTests) {
             NLs::HasOffloadConfig,
         });
 
-        TestDescribeResult(DescribePrivatePath(runtime, "/MyRoot/Table/continuousBackupImpl/incBackupImpl"), {
+        TestDescribeResult(DescribePrivatePath(runtime, "/MyRoot/Table/incBackupImpl"), {
             NLs::PathExist,
             NLs::IsTable,
             NLs::CheckColumns("incBackupImpl", {"key", "value", "__incrBackupImpl_deleted"}, {}, {"key"}),