Cosmetic changes (#14507)

Author: CyberROFL

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

@@ -8,8 +8,7 @@
 
 #include <util/string/printf.h>
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 TString DataFileName(ui32 id) {
     return Sprintf("data_%02d.csv", id);
@@ -85,5 +84,4 @@ TDumpResult TClient::DumpDatabase(const TString& database, const TString& fsPath
     return Impl_->DumpDatabase(database, fsPath);
 }
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/dump.h

@@ -13,7 +13,7 @@ class TLog;
 namespace NYdb {
 
 inline namespace V3 {
-class TDriver;
+    class TDriver;
 }
 
 namespace NDump {

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

@@ -4,8 +4,7 @@
 #include <ydb/library/backup/util.h>
 #include <ydb/public/lib/ydb_cli/dump/util/util.h>
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 TDumpClient::TDumpClient(const TDriver& driver, const std::shared_ptr<TLog>& log)
     : Driver(driver)
@@ -60,5 +59,4 @@ TDumpResult TDumpClient::DumpDatabase(const TString& database, const TString& fs
     }
 }
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/dump_impl.h

@@ -2,8 +2,7 @@
 
 #include "dump.h"
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 class TDumpClient {
 public:
@@ -21,5 +20,4 @@ class TDumpClient {
 
 }; // TDumpClient
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

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

@@ -3,8 +3,7 @@
 #include <ydb/library/backup/query_builder.h>
 #include <ydb/library/backup/query_uploader.h>
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 using namespace NBackup;
 using namespace NTable;
@@ -183,5 +182,4 @@ NPrivate::IDataWriter* CreateCompatWriter(
     return new TDataWriter(path, tableClient, accumulator, settings);
 }
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/restore_compat.h

@@ -2,8 +2,7 @@
 
 #include "restore_impl.h"
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 NPrivate::IDataAccumulator* CreateCompatAccumulator(
     const TString& path,
@@ -16,5 +15,4 @@ NPrivate::IDataWriter* CreateCompatWriter(
     const NPrivate::IDataAccumulator* accumulator,
     const TRestoreSettings& settings);
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

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

@@ -218,8 +218,8 @@ TStatus CreateCoordinationNode(
 
 TStatus CreateRateLimiter(
     TRateLimiterClient& client,
-    const std::string& coordinationNodePath,
-    const std::string& rateLimiterPath,
+    const TString& coordinationNodePath,
+    const TString& rateLimiterPath,
     const Ydb::RateLimiter::CreateResourceRequest& request)
 {
     const auto settings = TCreateResourceSettings(request);
@@ -540,6 +540,10 @@ TRestoreResult TRestoreClient::RestoreView(
     const TString dbPath = dbRestoreRoot + dbPathRelativeToRestoreRoot;
     LOG_I("Restore view " << fsPath.GetPath().Quote() << " to " << dbPath.Quote());
 
+    if (settings.DryRun_) {
+        return CheckExistenceAndType(SchemeClient, dbPath, ESchemeEntryType::View);
+    }
+
     TString query = ReadViewQuery(fsPath, Log.get());
 
     NYql::TIssues issues;
@@ -548,11 +552,6 @@ TRestoreResult TRestoreClient::RestoreView(
         return Result<TRestoreResult>(fsPath.GetPath(), EStatus::BAD_REQUEST, issues.ToString());
     }
 
-    if (settings.DryRun_) {
-        return CheckExistenceAndType(SchemeClient, dbPath, ESchemeEntryType::View);
-    }
-
-    LOG_D("Executing view creation query: " << query.Quote());
     auto result = QueryClient.RetryQuerySync([&](NQuery::TSession session) {
         return session.ExecuteQuery(query, NQuery::TTxControl::NoTx()).ExtractValueSync();
     });
@@ -592,8 +591,8 @@ TRestoreResult TRestoreClient::RestoreTopic(
         return CheckExistenceAndType(SchemeClient, dbPath, ESchemeEntryType::Topic);
     }
 
-    const auto creationRequest = ReadTopicCreationRequest(fsPath, Log.get());
-    auto result = CreateTopic(TopicClient, dbPath, creationRequest);
+    const auto request = ReadTopicCreationRequest(fsPath, Log.get());
+    auto result = CreateTopic(TopicClient, dbPath, request);
     if (result.IsSuccess()) {
         LOG_D("Created " << dbPath.Quote());
         return RestorePermissions(fsPath, dbPath, settings, isAlreadyExisting);
@@ -657,8 +656,8 @@ TRestoreResult TRestoreClient::RestoreRateLimiter(
         return *error;
     }
 
-    const auto creationRequest = ReadRateLimiterCreationRequest(fsPath, Log.get());
-    auto result = CreateRateLimiter(RateLimiterClient, coordinationNodePath, rateLimiterPath, creationRequest);
+    const auto request = ReadRateLimiterCreationRequest(fsPath, Log.get());
+    auto result = CreateRateLimiter(RateLimiterClient, coordinationNodePath, rateLimiterPath, request);
     if (result.IsSuccess()) {
         LOG_D("Created rate limiter: " << rateLimiterPath.Quote()
             << " dependent on the coordination node: " << coordinationNodePath.Quote()
@@ -669,37 +668,36 @@ TRestoreResult TRestoreClient::RestoreRateLimiter(
     LOG_E("Failed to create rate limiter: " << rateLimiterPath.Quote()
         << " dependent on the coordination node: " << coordinationNodePath.Quote()
     );
-    return Result<TRestoreResult>(JoinFsPaths(coordinationNodePath, rateLimiterPath), std::move(result));
+    return Result<TRestoreResult>(Join("/", coordinationNodePath, rateLimiterPath), std::move(result));
 }
 
-TRestoreResult TRestoreClient::RestoreDependentResources(
-    const TFsPath& coordinationNodeFsPath, const TString& coordinationNodeDbPath)
-{
-    LOG_I("Restore coordination node's resources " << coordinationNodeFsPath.GetPath().Quote()
-        << " to " << coordinationNodeDbPath.Quote()
+TRestoreResult TRestoreClient::RestoreDependentResources(const TFsPath& fsPath, const TString& dbPath) {
+    LOG_I("Restore coordination node's resources " << fsPath.GetPath().Quote()
+        << " to " << dbPath.Quote()
     );
 
     TVector<TFsPath> children;
-    coordinationNodeFsPath.List(children);
+    fsPath.List(children);
     TDeque<TFsPath> pathQueue(children.begin(), children.end());
     while (!pathQueue.empty()) {
         const auto path = pathQueue.front();
         pathQueue.pop_front();
+
         if (path.IsDirectory()) {
             if (IsFileExists(path.Child(NFiles::CreateRateLimiter().FileName))) {
-                const auto result = RestoreRateLimiter(
-                    path, coordinationNodeDbPath, path.RelativeTo(coordinationNodeFsPath).GetPath()
-                );
+                const auto result = RestoreRateLimiter(path, dbPath, path.RelativeTo(fsPath).GetPath());
                 if (!result.IsSuccess()) {
                     return result;
                 }
             }
+
             children.clear();
             path.List(children);
             pathQueue.insert(pathQueue.end(), children.begin(), children.end());
         }
 
     }
+
     return Result<TRestoreResult>();
 }
 
@@ -721,16 +719,18 @@ TRestoreResult TRestoreClient::RestoreCoordinationNode(
         return CheckExistenceAndType(SchemeClient, dbPath, ESchemeEntryType::CoordinationNode);
     }
 
-    const auto creationRequest = ReadCoordinationNodeCreationRequest(fsPath, Log.get());
-    auto result = CreateCoordinationNode(CoordinationNodeClient, dbPath, creationRequest);
+    const auto request = ReadCoordinationNodeCreationRequest(fsPath, Log.get());
+    auto result = CreateCoordinationNode(CoordinationNodeClient, dbPath, request);
     if (result.IsSuccess()) {
         if (auto result = RestoreDependentResources(fsPath, dbPath); !result.IsSuccess()) {
             LOG_E("Failed to create coordination node's resources " << dbPath.Quote());
             return Result<TRestoreResult>(dbPath, std::move(result));
         }
+
         LOG_D("Created " << dbPath.Quote());
         return RestorePermissions(fsPath, dbPath, settings, isAlreadyExisting);
     }
+
     LOG_E("Failed to create " << dbPath.Quote());
     return Result<TRestoreResult>(dbPath, std::move(result));
 }

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

@@ -16,8 +16,7 @@
 #include <util/stream/fwd.h>
 #include <util/string/builder.h>
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 extern const char DOC_API_TABLE_VERSION_ATTR[23];
 extern const char DOC_API_REQUEST_TYPE[22];
@@ -179,5 +178,4 @@ class TRestoreClient {
 
 }; // TRestoreClient
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

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

@@ -22,8 +22,7 @@
 #include <util/system/mutex.h>
 #include <util/thread/pool.h>
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 using namespace NImport;
 using namespace NTable;
@@ -1007,5 +1006,4 @@ NPrivate::IDataWriter* CreateImportDataWriter(
     return new TDataWriter(path, desc, partitionCount, settings, importClient, tableClient, accumulators, log);
 }
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/restore_import_data.h

@@ -4,8 +4,7 @@
 
 class TLog;
 
-namespace NYdb {
-namespace NDump {
+namespace NYdb::NDump {
 
 NPrivate::IDataAccumulator* CreateImportDataAccumulator(
     const NTable::TTableDescription& dumpedDesc,
@@ -23,5 +22,4 @@ NPrivate::IDataWriter* CreateImportDataWriter(
     const TRestoreSettings& settings,
     const std::shared_ptr<TLog>& log);
 
-} // NDump
-} // NYdb
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/util/query_utils.h

@@ -29,4 +29,4 @@ bool RewriteCreateQuery(TString& query, std::string_view pattern, const std::str
 TString GetBackupRoot(const TString& query);
 TString GetDatabase(const TString& query);
 
-}
+} // NYdb::NDump

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

@@ -59,4 +59,4 @@ TGetDatabaseStatusResult GetDatabaseStatus(TCmsClient& cmsClient, const std::str
     });
 }
 
-}
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/util/util.h

@@ -71,4 +71,4 @@ NCms::TGetDatabaseStatusResult GetDatabaseStatus(
     const std::string& path,
     const NCms::TGetDatabaseStatusSettings& settings = {});
 
-} // namespace NYDB::NDump
+} // NYdb::NDump

ydb/public/lib/ydb_cli/dump/util/view_utils.h

@@ -17,4 +17,4 @@ bool RewriteCreateViewQuery(TString& query, const TString& restoreRoot, bool res
     const TString& dbPath, NYql::TIssues& issues
 );
 
-}
+} // NYdb::NDump