aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprettysimple <prettysimple@yandex-team.ru>2022-02-10 16:52:21 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:52:21 +0300
commit4de469d3d7309f58fb491d9528ef5942f162bde6 (patch)
treeab7fbbf3253d4c0e2793218f09378908beb025fb
parentd5a3909d8b41ef875c60a088bdd77fc099c78ffb (diff)
downloadydb-4de469d3d7309f58fb491d9528ef5942f162bde6.tar.gz
Restoring authorship annotation for <prettysimple@yandex-team.ru>. Commit 2 of 2.
-rw-r--r--ydb/library/backup/backup.cpp56
-rw-r--r--ydb/public/lib/ydb_cli/commands/ydb_tools.cpp8
-rw-r--r--ydb/public/lib/ydb_cli/commands/ydb_tools.h4
-rw-r--r--ydb/public/lib/ydb_cli/common/recursive_list.cpp8
-rw-r--r--ydb/public/lib/ydb_cli/common/recursive_list.h2
-rw-r--r--ydb/public/lib/ydb_cli/dump/dump.cpp2
-rw-r--r--ydb/public/lib/ydb_cli/dump/dump.h2
-rw-r--r--ydb/public/lib/ydb_cli/dump/dump_impl.cpp2
-rw-r--r--ydb/public/lib/ydb_cli/dump/restore_impl.cpp88
-rw-r--r--ydb/public/lib/ydb_cli/dump/restore_impl.h4
-rw-r--r--ydb/public/lib/ydb_cli/dump/util/util.cpp168
-rw-r--r--ydb/public/lib/ydb_cli/dump/util/util.h8
-rw-r--r--ydb/public/lib/ydb_cli/dump/util/ya.make28
13 files changed, 190 insertions, 190 deletions
diff --git a/ydb/library/backup/backup.cpp b/ydb/library/backup/backup.cpp
index 0801918da0f..676cc831ee2 100644
--- a/ydb/library/backup/backup.cpp
+++ b/ydb/library/backup/backup.cpp
@@ -505,14 +505,14 @@ void RemoveClusterDirectory(const TDriver& driver, const TString& path) {
LOG_DEBUG("Directory is removed, path: " << path.Quote());
}
-void RemoveClusterDirectoryRecursive(const TDriver& driver, const TString& path) {
- NScheme::TSchemeClient schemeClient(driver);
- NTable::TTableClient tableClient(driver);
- TStatus status = NYdb::NDump::RemoveDirectoryRecursive(tableClient, schemeClient, path);
- VerifyStatus(status, TStringBuilder() << "RemoveDirectoryRecursive, path: " << path.Quote());
- LOG_DEBUG("Directory is removed recursively, path: " << path.Quote());
-}
-
+void RemoveClusterDirectoryRecursive(const TDriver& driver, const TString& path) {
+ NScheme::TSchemeClient schemeClient(driver);
+ NTable::TTableClient tableClient(driver);
+ TStatus status = NYdb::NDump::RemoveDirectoryRecursive(tableClient, schemeClient, path);
+ VerifyStatus(status, TStringBuilder() << "RemoveDirectoryRecursive, path: " << path.Quote());
+ LOG_DEBUG("Directory is removed recursively, path: " << path.Quote());
+}
+
static bool IsExcluded(const TString& path, const TVector<TRegExMatch>& exclusionPatterns) {
for (const auto& pattern : exclusionPatterns) {
if (pattern.Match(path.c_str())) {
@@ -675,30 +675,30 @@ void BackupFolder(TDriver driver, const TString& database, const TString& relDbP
// full path to temporal directory in database
TString tmpDbFolder;
- try {
- if (!schemaOnly && !avoidCopy) {
- // Create temporal folder in database's root directory
- tmpDbFolder = JoinDatabasePath(database, "~" + temporalBackupPostfix);
- CreateClusterDirectory(driver, tmpDbFolder);
- }
-
- TString dbPrefix = JoinDatabasePath(database, relDbPath);
- TString path;
+ try {
+ if (!schemaOnly && !avoidCopy) {
+ // Create temporal folder in database's root directory
+ tmpDbFolder = JoinDatabasePath(database, "~" + temporalBackupPostfix);
+ CreateClusterDirectory(driver, tmpDbFolder);
+ }
+
+ TString dbPrefix = JoinDatabasePath(database, relDbPath);
+ TString path;
BackupFolderImpl(driver, dbPrefix, tmpDbFolder, path, folderPath, exclusionPatterns,
schemaOnly, useConsistentCopyTable, avoidCopy, preservePoolKinds);
- } catch (...) {
- if (!schemaOnly && !avoidCopy) {
- RemoveClusterDirectoryRecursive(driver, tmpDbFolder);
- }
-
- // delete partial backup (or save)
- if (!savePartialResult) {
- folderPath.ForceDelete();
- }
- throw;
+ } catch (...) {
+ if (!schemaOnly && !avoidCopy) {
+ RemoveClusterDirectoryRecursive(driver, tmpDbFolder);
+ }
+
+ // delete partial backup (or save)
+ if (!savePartialResult) {
+ folderPath.ForceDelete();
+ }
+ throw;
}
if (!schemaOnly && !avoidCopy) {
- RemoveClusterDirectoryRecursive(driver, tmpDbFolder);
+ RemoveClusterDirectoryRecursive(driver, tmpDbFolder);
}
}
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp b/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp
index 5bb419d39ed..db4ec14d30c 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp
@@ -57,7 +57,7 @@ void TCommandDump::Config(TConfig& config) {
.StoreTrue(&AvoidCopy);
config.Opts->AddLongOption("save-partial-result", "Do not remove partial dump result."
" If this option is not enabled, all files that have already been created will be removed in case of error.")
- .StoreTrue(&SavePartialResult);
+ .StoreTrue(&SavePartialResult);
config.Opts->AddLongOption("preserve-pool-kinds", "Preserve storage pool kind settings."
" If this option is enabled, storage pool kind will be saved to dump."
" In this case, if there will be no such storage pool kind in database on restore, error will occur."
@@ -145,8 +145,8 @@ void TCommandRestore::Config(TConfig& config) {
config.Opts->AddLongOption("save-partial-result", "Do not remove partial restore result."
" If this option is not enabled, all changes in database that have already been applied during restore"
" will be reverted in case of error.")
- .StoreTrue(&SavePartialResult);
-
+ .StoreTrue(&SavePartialResult);
+
config.Opts->AddLongOption("bandwidth", "Limit data upload bandwidth, bytes per second (example: 2MiB)")
.DefaultValue("0").StoreResult(&UploadBandwidth);
@@ -191,7 +191,7 @@ int TCommandRestore::Run(TConfig& config) {
.RestoreData(RestoreData)
.RestoreIndexes(RestoreIndexes)
.SkipDocumentTables(SkipDocumentTables)
- .SavePartialResult(SavePartialResult)
+ .SavePartialResult(SavePartialResult)
.RowsPerRequest(NYdb::SizeFromString(RowsPerRequest))
.InFly(InFly);
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_tools.h b/ydb/public/lib/ydb_cli/commands/ydb_tools.h
index d18977ebc73..3a1218a9816 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_tools.h
+++ b/ydb/public/lib/ydb_cli/commands/ydb_tools.h
@@ -40,7 +40,7 @@ private:
TString FilePath;
bool IsSchemeOnly;
bool AvoidCopy = false;
- bool SavePartialResult = false;
+ bool SavePartialResult = false;
TString ConsistencyLevel;
bool PreservePoolKinds = false;
};
@@ -58,7 +58,7 @@ private:
bool RestoreData = true;
bool RestoreIndexes = true;
bool SkipDocumentTables = false;
- bool SavePartialResult = false;
+ bool SavePartialResult = false;
TString UploadBandwidth;
TString UploadRps;
TString RowsPerRequest;
diff --git a/ydb/public/lib/ydb_cli/common/recursive_list.cpp b/ydb/public/lib/ydb_cli/common/recursive_list.cpp
index 3d6ecbf16d5..3decf4fb56c 100644
--- a/ydb/public/lib/ydb_cli/common/recursive_list.cpp
+++ b/ydb/public/lib/ydb_cli/common/recursive_list.cpp
@@ -15,7 +15,7 @@ namespace {
return result;
}
- TStatus RecursiveList(TVector<TSchemeEntry>& dst, TSchemeClient& client,
+ TStatus RecursiveList(TVector<TSchemeEntry>& dst, TSchemeClient& client,
const TString& path, const TRecursiveListSettings& settings, bool addSelf = false) {
auto list = client.ListDirectory(path, settings.ListDirectorySettings_).GetValueSync();
@@ -24,7 +24,7 @@ namespace {
}
const auto& self = list.GetEntry();
- if (addSelf && settings.Filter_(self)) {
+ if (addSelf && settings.Filter_(self)) {
dst.push_back(ReplaceNameWithPath(self, path));
}
@@ -56,11 +56,11 @@ namespace {
} // anonymous
-TRecursiveListResult RecursiveList(TSchemeClient& client, const TString& path,
+TRecursiveListResult RecursiveList(TSchemeClient& client, const TString& path,
const TRecursiveListSettings& settings, bool addSelf) {
TVector<TSchemeEntry> entries;
- auto status = RecursiveList(entries, client, path, settings, addSelf);
+ auto status = RecursiveList(entries, client, path, settings, addSelf);
return {entries, status};
}
diff --git a/ydb/public/lib/ydb_cli/common/recursive_list.h b/ydb/public/lib/ydb_cli/common/recursive_list.h
index 6945def2476..3448c00f9b7 100644
--- a/ydb/public/lib/ydb_cli/common/recursive_list.h
+++ b/ydb/public/lib/ydb_cli/common/recursive_list.h
@@ -27,7 +27,7 @@ struct TRecursiveListResult {
};
TRecursiveListResult RecursiveList(NScheme::TSchemeClient& client, const TString& path,
- const TRecursiveListSettings& settings = {}, bool addSelf = true);
+ const TRecursiveListSettings& settings = {}, bool addSelf = true);
}
}
diff --git a/ydb/public/lib/ydb_cli/dump/dump.cpp b/ydb/public/lib/ydb_cli/dump/dump.cpp
index 96710269765..093d90b54c2 100644
--- a/ydb/public/lib/ydb_cli/dump/dump.cpp
+++ b/ydb/public/lib/ydb_cli/dump/dump.cpp
@@ -36,7 +36,7 @@ public:
}
TRestoreResult Restore(const TString& fsPath, const TString& dbPath, const TRestoreSettings& settings) {
- auto client = TRestoreClient(ImportClient, OperationClient, SchemeClient, TableClient);
+ auto client = TRestoreClient(ImportClient, OperationClient, SchemeClient, TableClient);
return client.Restore(fsPath, dbPath, settings);
}
diff --git a/ydb/public/lib/ydb_cli/dump/dump.h b/ydb/public/lib/ydb_cli/dump/dump.h
index 3e843337afd..877948d1056 100644
--- a/ydb/public/lib/ydb_cli/dump/dump.h
+++ b/ydb/public/lib/ydb_cli/dump/dump.h
@@ -65,7 +65,7 @@ struct TRestoreSettings: public TOperationRequestSettings<TRestoreSettings> {
FLUENT_SETTING_DEFAULT(bool, RestoreData, true);
FLUENT_SETTING_DEFAULT(bool, RestoreIndexes, true);
FLUENT_SETTING_DEFAULT(bool, SkipDocumentTables, false);
- FLUENT_SETTING_DEFAULT(bool, SavePartialResult, false);
+ FLUENT_SETTING_DEFAULT(bool, SavePartialResult, false);
FLUENT_SETTING_DEFAULT(ui64, MemLimit, 16_MB);
FLUENT_SETTING_DEFAULT(ui64, RowsPerRequest, 0);
diff --git a/ydb/public/lib/ydb_cli/dump/dump_impl.cpp b/ydb/public/lib/ydb_cli/dump/dump_impl.cpp
index 8eaf1c8541b..a02f7facae5 100644
--- a/ydb/public/lib/ydb_cli/dump/dump_impl.cpp
+++ b/ydb/public/lib/ydb_cli/dump/dump_impl.cpp
@@ -1,7 +1,7 @@
#include "dump_impl.h"
#include <ydb/public/lib/ydb_cli/dump/util/util.h>
-
+
namespace NYdb {
namespace NDump {
diff --git a/ydb/public/lib/ydb_cli/dump/restore_impl.cpp b/ydb/public/lib/ydb_cli/dump/restore_impl.cpp
index ec9681d3905..74f4ffd18c9 100644
--- a/ydb/public/lib/ydb_cli/dump/restore_impl.cpp
+++ b/ydb/public/lib/ydb_cli/dump/restore_impl.cpp
@@ -8,7 +8,7 @@
#include <ydb/public/lib/ydb_cli/dump/util/util.h>
#include <util/generic/hash.h>
-#include <util/generic/hash_set.h>
+#include <util/generic/hash_set.h>
#include <util/generic/maybe.h>
#include <util/generic/vector.h>
#include <util/stream/file.h>
@@ -20,7 +20,7 @@ namespace NDump {
using namespace NImport;
using namespace NOperation;
-using namespace NScheme;
+using namespace NScheme;
using namespace NTable;
extern const char DOC_API_TABLE_VERSION_ATTR[] = "__document_api_version";
@@ -102,85 +102,85 @@ bool HasRunningIndexBuilds(TOperationClient& client, const TString& dbPath) {
TRestoreClient::TRestoreClient(
TImportClient& importClient,
TOperationClient& operationClient,
- TSchemeClient& schemeClient,
+ TSchemeClient& schemeClient,
TTableClient& tableClient)
: ImportClient(importClient)
, OperationClient(operationClient)
- , SchemeClient(schemeClient)
+ , SchemeClient(schemeClient)
, TableClient(tableClient)
{
}
TRestoreResult TRestoreClient::Restore(const TString& fsPath, const TString& dbPath, const TRestoreSettings& settings) {
// find existing items
- TFsPath dbBasePath = dbPath;
-
- while (true) {
+ TFsPath dbBasePath = dbPath;
+
+ while (true) {
auto result = DescribePath(SchemeClient, dbBasePath).GetStatus();
-
- if (result == EStatus::SUCCESS) {
- break;
- }
-
- if (result != EStatus::SCHEME_ERROR) {
+
+ if (result == EStatus::SUCCESS) {
+ break;
+ }
+
+ if (result != EStatus::SCHEME_ERROR) {
return Result<TRestoreResult>(EStatus::SCHEME_ERROR, "Can not find existing path");
- }
-
- dbBasePath = dbBasePath.Parent();
- }
+ }
+
+ dbBasePath = dbBasePath.Parent();
+ }
auto oldDirectoryList = SchemeClient.ListDirectory(dbBasePath).GetValueSync();
if (!oldDirectoryList.IsSuccess()) {
return Result<TRestoreResult>(EStatus::SCHEME_ERROR, "Can not list existing directory");
- }
-
- THashSet<TString> oldEntries;
+ }
+
+ THashSet<TString> oldEntries;
for (const auto& entry : oldDirectoryList.GetChildren()) {
- oldEntries.insert(entry.Name);
- }
-
+ oldEntries.insert(entry.Name);
+ }
+
// restore
- auto restoreResult = RestoreFolder(fsPath, dbPath, settings);
- if (restoreResult.IsSuccess() || settings.SavePartialResult_) {
- return restoreResult;
- }
-
+ auto restoreResult = RestoreFolder(fsPath, dbPath, settings);
+ if (restoreResult.IsSuccess() || settings.SavePartialResult_) {
+ return restoreResult;
+ }
+
// cleanup
- auto newDirectoryList = SchemeClient.ListDirectory(dbBasePath).GetValueSync();
- if (!newDirectoryList.IsSuccess()) {
- return restoreResult;
- }
-
- for (const auto& entry : newDirectoryList.GetChildren()) {
+ auto newDirectoryList = SchemeClient.ListDirectory(dbBasePath).GetValueSync();
+ if (!newDirectoryList.IsSuccess()) {
+ return restoreResult;
+ }
+
+ for (const auto& entry : newDirectoryList.GetChildren()) {
if (oldEntries.contains(entry.Name)) {
continue;
}
auto fullPath = dbBasePath.Child(entry.Name);
-
+
switch (entry.Type) {
case ESchemeEntryType::Directory: {
- auto result = RemoveDirectoryRecursive(TableClient, SchemeClient, fullPath, {}, true);
+ auto result = RemoveDirectoryRecursive(TableClient, SchemeClient, fullPath, {}, true);
if (!result.IsSuccess()) {
return restoreResult;
- }
+ }
break;
}
case ESchemeEntryType::Table: {
- auto result = TableClient.RetryOperationSync([path = fullPath](TSession session) {
+ auto result = TableClient.RetryOperationSync([path = fullPath](TSession session) {
return session.DropTable(path).GetValueSync();
});
if (!result.IsSuccess()) {
return restoreResult;
- }
+ }
break;
- }
+ }
default:
return restoreResult;
- }
- }
-
- return restoreResult;
+ }
+ }
+
+ return restoreResult;
}
TRestoreResult TRestoreClient::RestoreFolder(const TFsPath& fsPath, const TString& dbPath, const TRestoreSettings& settings) {
diff --git a/ydb/public/lib/ydb_cli/dump/restore_impl.h b/ydb/public/lib/ydb_cli/dump/restore_impl.h
index 1b593944f9c..a0109371706 100644
--- a/ydb/public/lib/ydb_cli/dump/restore_impl.h
+++ b/ydb/public/lib/ydb_cli/dump/restore_impl.h
@@ -47,7 +47,7 @@ public:
explicit TRestoreClient(
NImport::TImportClient& importClient,
NOperation::TOperationClient& operationClient,
- NScheme::TSchemeClient& SchemeClient,
+ NScheme::TSchemeClient& SchemeClient,
NTable::TTableClient& tableClient);
TRestoreResult Restore(const TString& fsPath, const TString& dbPath, const TRestoreSettings& settings = {});
@@ -55,7 +55,7 @@ public:
private:
NImport::TImportClient& ImportClient;
NOperation::TOperationClient& OperationClient;
- NScheme::TSchemeClient& SchemeClient;
+ NScheme::TSchemeClient& SchemeClient;
NTable::TTableClient& TableClient;
}; // TRestoreClient
diff --git a/ydb/public/lib/ydb_cli/dump/util/util.cpp b/ydb/public/lib/ydb_cli/dump/util/util.cpp
index c4d550f6dc3..37c8d4b646b 100644
--- a/ydb/public/lib/ydb_cli/dump/util/util.cpp
+++ b/ydb/public/lib/ydb_cli/dump/util/util.cpp
@@ -1,58 +1,58 @@
#include "util.h"
#include <ydb/public/lib/ydb_cli/common/recursive_list.h>
-
-#include <util/folder/path.h>
-
+
+#include <util/folder/path.h>
+
namespace NYdb {
namespace NDump {
using namespace NScheme;
using namespace NTable;
-namespace {
-
-// function must return TStatus or derived struct
-// function must be re-invokable
-template <typename TFunction>
-decltype(auto) RetryFunction(
- const TFunction& func,
- const ui32 maxRetries = 10,
- TDuration retrySleep = TDuration::MilliSeconds(500)) {
-
- for (ui32 retryNumber = 0; retryNumber <= maxRetries; ++retryNumber) {
- auto result = func();
-
- if (result.IsSuccess()) {
- return result;
- }
-
- if (retryNumber == maxRetries) {
- return result;
- }
-
- switch (result.GetStatus()) {
- case EStatus::ABORTED:
- break;
-
- case EStatus::UNAVAILABLE:
- case EStatus::OVERLOADED:
- case EStatus::TRANSPORT_UNAVAILABLE:
- case EStatus::CLIENT_RESOURCE_EXHAUSTED: {
- ExponentialBackoff(retrySleep);
- break;
- }
- default:
- return result;
- }
-
- }
- // unreachable
- return func();
-}
-
-} // anonymous
-
+namespace {
+
+// function must return TStatus or derived struct
+// function must be re-invokable
+template <typename TFunction>
+decltype(auto) RetryFunction(
+ const TFunction& func,
+ const ui32 maxRetries = 10,
+ TDuration retrySleep = TDuration::MilliSeconds(500)) {
+
+ for (ui32 retryNumber = 0; retryNumber <= maxRetries; ++retryNumber) {
+ auto result = func();
+
+ if (result.IsSuccess()) {
+ return result;
+ }
+
+ if (retryNumber == maxRetries) {
+ return result;
+ }
+
+ switch (result.GetStatus()) {
+ case EStatus::ABORTED:
+ break;
+
+ case EStatus::UNAVAILABLE:
+ case EStatus::OVERLOADED:
+ case EStatus::TRANSPORT_UNAVAILABLE:
+ case EStatus::CLIENT_RESOURCE_EXHAUSTED: {
+ ExponentialBackoff(retrySleep);
+ break;
+ }
+ default:
+ return result;
+ }
+
+ }
+ // unreachable
+ return func();
+}
+
+} // anonymous
+
TStatus DescribeTable(TTableClient& tableClient, const TString& path, TMaybe<TTableDescription>& out) {
auto func = [&path, &out](TSession session) {
auto settings = TDescribeTableSettings().WithKeyShardBoundary(true);
@@ -75,62 +75,62 @@ void ExponentialBackoff(TDuration& sleep, TDuration max) {
TDescribePathResult DescribePath(TSchemeClient& schemeClient, const TString& path, const TDescribePathSettings& settings) {
return RetryFunction([&]() -> TDescribePathResult {
- return schemeClient.DescribePath(path, settings).GetValueSync();
- });
-}
-
+ return schemeClient.DescribePath(path, settings).GetValueSync();
+ });
+}
+
TStatus MakeDirectory(TSchemeClient& schemeClient, const TString& path, const TMakeDirectorySettings& settings) {
- return RetryFunction([&]() -> TStatus {
+ return RetryFunction([&]() -> TStatus {
return schemeClient.MakeDirectory(path, settings).GetValueSync();
});
}
TStatus RemoveDirectory(TSchemeClient& schemeClient, const TString& path, const TRemoveDirectorySettings& settings) {
return RetryFunction([&]() -> TStatus {
- return schemeClient.RemoveDirectory(path, settings).GetValueSync();
- });
-}
-
-TStatus RemoveDirectoryRecursive(
+ return schemeClient.RemoveDirectory(path, settings).GetValueSync();
+ });
+}
+
+TStatus RemoveDirectoryRecursive(
TTableClient& tableClient,
TSchemeClient& schemeClient,
- const TString& path,
+ const TString& path,
const TRemoveDirectorySettings& settings,
- bool removeSelf) {
-
+ bool removeSelf) {
+
auto recursiveListResult = NConsoleClient::RecursiveList(schemeClient, path, {}, removeSelf);
- if (!recursiveListResult.Status.IsSuccess()) {
- return recursiveListResult.Status;
- }
-
- // output order is: Root, Recursive(children)...
- // we need to reverse it to delete recursively
- for (auto it = recursiveListResult.Entries.rbegin(); it != recursiveListResult.Entries.rend(); ++it) {
- const auto& entry = *it;
- switch (entry.Type) {
+ if (!recursiveListResult.Status.IsSuccess()) {
+ return recursiveListResult.Status;
+ }
+
+ // output order is: Root, Recursive(children)...
+ // we need to reverse it to delete recursively
+ for (auto it = recursiveListResult.Entries.rbegin(); it != recursiveListResult.Entries.rend(); ++it) {
+ const auto& entry = *it;
+ switch (entry.Type) {
case ESchemeEntryType::Directory: {
auto result = RemoveDirectory(schemeClient, entry.Name, settings);
- if (!result.IsSuccess()) {
- return result;
- }
- break;
- }
+ if (!result.IsSuccess()) {
+ return result;
+ }
+ break;
+ }
case ESchemeEntryType::Table: {
auto result = tableClient.RetryOperationSync([path = entry.Name](TSession session) {
return session.DropTable(path).GetValueSync();
});
- if (!result.IsSuccess()) {
- return result;
- }
- break;
- }
- default:
+ if (!result.IsSuccess()) {
+ return result;
+ }
+ break;
+ }
+ default:
return TStatus(EStatus::BAD_REQUEST, {});
- }
- }
-
+ }
+ }
+
return TStatus(EStatus::SUCCESS, {});
-}
-
+}
+
} // NDump
} // NYdb
diff --git a/ydb/public/lib/ydb_cli/dump/util/util.h b/ydb/public/lib/ydb_cli/dump/util/util.h
index fc4d4d68052..d5e8fc3b97d 100644
--- a/ydb/public/lib/ydb_cli/dump/util/util.h
+++ b/ydb/public/lib/ydb_cli/dump/util/util.h
@@ -31,7 +31,7 @@ NScheme::TDescribePathResult DescribePath(
NScheme::TSchemeClient& schemeClient,
const TString& path,
const NScheme::TDescribePathSettings& settings = {});
-
+
TStatus MakeDirectory(
NScheme::TSchemeClient& schemeClient,
const TString& path,
@@ -41,13 +41,13 @@ TStatus RemoveDirectory(
NScheme::TSchemeClient& schemeClient,
const TString& path,
const NScheme::TRemoveDirectorySettings& settings = {});
-
-TStatus RemoveDirectoryRecursive(
+
+TStatus RemoveDirectoryRecursive(
NTable::TTableClient& tableClient,
NScheme::TSchemeClient& schemeClient,
const TString& path,
const NScheme::TRemoveDirectorySettings& settings = {},
bool removeSelf = true);
-
+
} // NDump
} // NYdb
diff --git a/ydb/public/lib/ydb_cli/dump/util/ya.make b/ydb/public/lib/ydb_cli/dump/util/ya.make
index 3d9dcd38014..24a3a5f2575 100644
--- a/ydb/public/lib/ydb_cli/dump/util/ya.make
+++ b/ydb/public/lib/ydb_cli/dump/util/ya.make
@@ -1,19 +1,19 @@
-LIBRARY()
-
-OWNER(
- prettysimple
- g:kikimr
-)
-
-SRCS(
- util.cpp
-)
-
-PEERDIR(
+LIBRARY()
+
+OWNER(
+ prettysimple
+ g:kikimr
+)
+
+SRCS(
+ util.cpp
+)
+
+PEERDIR(
ydb/public/lib/ydb_cli/common
ydb/public/sdk/cpp/client/ydb_scheme
ydb/public/sdk/cpp/client/ydb_table
ydb/public/sdk/cpp/client/ydb_types/status
-)
-
+)
+
END()