Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
stanislav-shchetinin committed Dec 11, 2024
1 parent 7bec6c3 commit 05dc464
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ydb/library/backup/backup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include <ydb/public/api/protos/ydb_table.pb.h>
#include <ydb/public/lib/ydb_cli/common/recursive_remove.h>
#include <ydb/public/lib/ydb_cli/dump/file/files.h>
#include <ydb/public/lib/ydb_cli/dump/files/files.h>
#include <ydb/public/lib/ydb_cli/dump/util/util.h>
#include <ydb/public/lib/yson_value/ydb_yson_value.h>
#include <ydb/public/sdk/cpp/client/ydb_driver/driver.h>
Expand Down Expand Up @@ -460,7 +460,7 @@ TFsPath CreateDirectory(const TFsPath& folderPath, const TString& name) {
return childFolderPath;
}

void WriteProtoToFile(const google::protobuf::Message& proto, const TFsPath& folderPath, const NBackup::NFiles::TFileInfo& fileInfo) {
void WriteProtoToFile(const google::protobuf::Message& proto, const TFsPath& folderPath, const NDump::NFiles::TFileInfo& fileInfo) {
TString protoStr;
google::protobuf::TextFormat::PrintToString(proto, &protoStr);
LOG_D("Write " << fileInfo.LogObjectType << " into " << folderPath.Child(fileInfo.FileName).GetPath().Quote());
Expand All @@ -472,7 +472,7 @@ void BackupPermissions(TDriver driver, const TString& dbPrefix, const TString& p
auto entry = DescribePath(driver, JoinDatabasePath(dbPrefix, path));
Ydb::Scheme::ModifyPermissionsRequest proto;
entry.SerializeTo(proto);
WriteProtoToFile(proto, folderPath, NBackup::NFiles::TablePermissions());
WriteProtoToFile(proto, folderPath, NDump::NFiles::Permissions());
}

void BackupTable(TDriver driver, const TString& dbPrefix, const TString& backupPrefix, const TString& path,
Expand All @@ -487,7 +487,7 @@ void BackupTable(TDriver driver, const TString& dbPrefix, const TString& backupP
auto desc = DescribeTable(driver, fullPath);
auto proto = ProtoFromTableDescription(desc, preservePoolKinds);

WriteProtoToFile(proto, folderPath, NBackup::NFiles::TableScheme());
WriteProtoToFile(proto, folderPath, NDump::NFiles::TableScheme());

BackupPermissions(driver, dbPrefix, path, folderPath);

Expand Down

0 comments on commit 05dc464

Please sign in to comment.