Little cosmetic changes (#14273)

Author: CyberROFL

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

@@ -274,8 +274,8 @@ TRestoreResult TRestoreClient::Restore(const TString& fsPath, const TString& dbP
     LOG_D("Resolved db base path: " << dbBasePath.GetPath().Quote());
 
     auto oldDirectoryList = RecursiveList(SchemeClient, dbBasePath);
-    if (!oldDirectoryList.Status.IsSuccess()) {
-        LOG_E("Error listing db base path: " << dbBasePath.GetPath().Quote() << ": " << oldDirectoryList.Status.GetIssues().ToOneLineString());
+    if (const auto& status = oldDirectoryList.Status; !status.IsSuccess()) {
+        LOG_E("Error listing db base path: " << dbBasePath.GetPath().Quote() << ": " << status.GetIssues().ToOneLineString());
         return Result<TRestoreResult>(EStatus::SCHEME_ERROR, "Can not list existing directory");
     }
 
@@ -489,9 +489,8 @@ TRestoreResult TRestoreClient::RestoreView(
     TString query = TFileInput(createViewFile).ReadAll();
 
     NYql::TIssues issues;
-    if (!RewriteCreateViewQuery(query, dbRestoreRoot, IsDatabase(SchemeClient, dbRestoreRoot), dbPath,
-        createViewFile.GetPath().Quote(), issues
-    )) {
+    const bool isDb = IsDatabase(SchemeClient, dbRestoreRoot);
+    if (!RewriteCreateViewQuery(query, dbRestoreRoot, isDb, dbPath, createViewFile.GetPath().Quote(), issues)) {
         return Result<TRestoreResult>(dbPath, EStatus::BAD_REQUEST, issues.ToString());
     }
 
@@ -565,7 +564,7 @@ TRestoreResult TRestoreClient::RestoreCoordinationNode(
     LOG_I("Restore coordination node " << fsPath.GetPath().Quote() << " to " << dbPath.Quote());
 
     if (settings.DryRun_) {
-        return CheckExistenceAndType(SchemeClient, dbPath, NScheme::ESchemeEntryType::CoordinationNode);
+        return CheckExistenceAndType(SchemeClient, dbPath, ESchemeEntryType::CoordinationNode);
     }
 
     const auto creationRequest = ReadCoordinationNodeCreationRequest(fsPath, Log.get());
@@ -727,7 +726,7 @@ TRestoreResult TRestoreClient::CreateDataAccumulators(
         TVector<THolder<NPrivate::IDataAccumulator>>& outAccumulators,
         const TString& dbPath,
         const TRestoreSettings& settings,
-        const NTable::TTableDescription& desc,
+        const TTableDescription& desc,
         ui32 dataFilesCount)
 {
     const ui32 accumulatorsCount = std::min(settings.InFly_, dataFilesCount);

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

@@ -955,10 +955,11 @@ class TDataWriter: public NPrivate::IDataWriter {
 } // anonymous
 
 NPrivate::IDataAccumulator* CreateImportDataAccumulator(
-        const NTable::TTableDescription& dumpedDesc,
-        const NTable::TTableDescription& actualDesc,
+        const TTableDescription& dumpedDesc,
+        const TTableDescription& actualDesc,
         const TRestoreSettings& settings,
-        const std::shared_ptr<TLog>& log) {
+        const std::shared_ptr<TLog>& log)
+{
     return new TDataAccumulator(dumpedDesc, actualDesc, settings, log);
 }
 
@@ -969,7 +970,8 @@ NPrivate::IDataWriter* CreateImportDataWriter(
         TTableClient& tableClient,
         const TVector<THolder<NPrivate::IDataAccumulator>>& accumulators,
         const TRestoreSettings& settings,
-        const std::shared_ptr<TLog>& log) {
+        const std::shared_ptr<TLog>& log)
+{
     return new TDataWriter(path, desc, settings, importClient, tableClient, accumulators, log);
 }