Fix restore data option in YDB CLI (#9009)

Author: pixcc

ydb/public/lib/ydb_cli/dump/restore_impl.cpp

@@ -45,6 +45,11 @@ TTableDescription TableDescriptionFromProto(const Ydb::Table::CreateTableRequest
     return TProtoAccessor::FromProto(proto);
 }
 
+TTableDescription TableDescriptionWithoutIndexesFromProto(Ydb::Table::CreateTableRequest proto) {
+    proto.clear_indexes();
+    return TableDescriptionFromProto(proto);
+}
+
 Ydb::Scheme::ModifyPermissionsRequest ReadPermissions(const TString& fsPath) {
     Ydb::Scheme::ModifyPermissionsRequest proto;
     Y_ENSURE(google::protobuf::TextFormat::ParseFromString(TFileInput(fsPath).ReadAll(), &proto));
@@ -221,15 +226,25 @@ TRestoreResult TRestoreClient::RestoreTable(const TFsPath& fsPath, const TString
     auto scheme = ReadTableScheme(fsPath.Child(SCHEME_FILE_NAME));
     auto dumpedDesc = TableDescriptionFromProto(scheme);
 
+    if (dumpedDesc.GetAttributes().contains(DOC_API_TABLE_VERSION_ATTR) && settings.SkipDocumentTables_) {
+        return Result<TRestoreResult>();
+    }
+
     if (settings.DryRun_) {
         return CheckSchema(dbPath, dumpedDesc);
     }
 
-    if (settings.RestoreData_) {
-        auto woIndexes = scheme;
-        woIndexes.clear_indexes();
+    auto withoutIndexesDesc = TableDescriptionWithoutIndexesFromProto(scheme);
+    auto createResult = TableClient.RetryOperationSync([&dbPath, &withoutIndexesDesc](TSession session) {
+        return session.CreateTable(dbPath, TTableDescription(withoutIndexesDesc),
+            TCreateTableSettings().RequestType(DOC_API_REQUEST_TYPE)).GetValueSync();
+    });
+    if (!createResult.IsSuccess()) {
+        return Result<TRestoreResult>(dbPath, std::move(createResult));
+    }
 
-        auto result = RestoreData(fsPath, dbPath, settings, TableDescriptionFromProto(woIndexes));
+    if (settings.RestoreData_) {
+        auto result = RestoreData(fsPath, dbPath, settings, withoutIndexesDesc);
         if (!result.IsSuccess()) {
             return result;
         }
@@ -303,18 +318,6 @@ struct TWriterWaiter {
 };
 
 TRestoreResult TRestoreClient::RestoreData(const TFsPath& fsPath, const TString& dbPath, const TRestoreSettings& settings, const TTableDescription& desc) {
-    if (desc.GetAttributes().contains(DOC_API_TABLE_VERSION_ATTR) && settings.SkipDocumentTables_) {
-        return Result<TRestoreResult>();
-    }
-
-    auto createResult = TableClient.RetryOperationSync([&dbPath, &desc](TSession session) {
-        return session.CreateTable(dbPath, TTableDescription(desc),
-            TCreateTableSettings().RequestType(DOC_API_REQUEST_TYPE)).GetValueSync();
-    });
-    if (!createResult.IsSuccess()) {
-        return Result<TRestoreResult>(dbPath, std::move(createResult));
-    }
-
     THolder<NPrivate::IDataAccumulator> accumulator;
     THolder<NPrivate::IDataWriter> writer;
 

ydb/tests/functional/ydb_cli/test_ydb_backup.py

@@ -1198,3 +1198,66 @@ def test_restore_acl_option(self):
             is_permissions_the_same(self.driver.scheme_client, "/Root/folder/table", "/Root/restored/table"),
             is_(False)
         )
+
+
+class TestRestoreNoData(BaseTestBackupInFiles):
+    def test_restore_no_data(self):
+        self.driver.scheme_client.make_directory("/Root/folder")
+
+        session = self.driver.table_client.session().create()
+
+        # Create table and modify permissions on it
+        create_table_with_data(session, "folder/table")
+        modify_permissions(self.driver.scheme_client, "folder/table")
+
+        # Backup table
+        backup_files_dir = output_path(self.test_name, "test_single_table", "backup_files_dir")
+        yatest_common.execute(
+            [
+                backup_bin(),
+                "--verbose",
+                "--endpoint", "grpc://localhost:%d" % self.cluster.nodes[1].grpc_port,
+                "--database", "/Root",
+                "tools", "dump",
+                "--path", "/Root/folder",
+                "--output", backup_files_dir
+            ]
+        )
+        assert_that(
+            os.listdir(backup_files_dir),
+            is_(["table"])
+        )
+        assert_that(
+            self.scheme_listdir("/Root"),
+            is_(["folder"])
+        )
+
+        # Restore table
+        restore_cmd = [
+            backup_bin(),
+            "--verbose",
+            "--endpoint", "grpc://localhost:%d" % self.cluster.nodes[1].grpc_port,
+            "--database", "/Root",
+            "tools", "restore",
+            "--path", "/Root/restored",
+            "--input", backup_files_dir,
+            "--restore-data", "false",
+        ]
+        yatest_common.execute(restore_cmd)
+
+        assert_that(
+            self.scheme_listdir("/Root"),
+            contains_inanyorder("folder", "restored")
+        )
+        assert_that(
+            self.scheme_listdir("/Root/restored"),
+            is_(["table"])
+        )
+        assert_that(
+            is_tables_the_same(session, self.driver.scheme_client, "/Root/folder/table", "/Root/restored/table", False),
+            is_(True)
+        )
+        assert_that(
+            is_data_the_same(session, "/Root/folder/table", "/Root/restored/table"),
+            is_(False)
+        )