Split view_utils (#14492)

author: Ilnaz Nizametdinov <ilnaz@ydb.tech> 2025-02-12 18:03:00 +0300
committer: GitHub <noreply@github.com> 2025-02-12 15:03:00 +0000
commit: b9ac376799be591d848e3dcc8e738c207339b484 (patch)
tree: 48ccf1d284954d10c75c05ab119367990601cf72
parent: b4819809e2e77584b75f9788f09fd793019ed3bd (diff)
download: ydb-b9ac376799be591d848e3dcc8e738c207339b484.tar.gz
8 files changed, 321 insertions, 269 deletions
diff --git a/ydb/public/lib/ydb_cli/dump/restore_impl.cpp b/ydb/public/lib/ydb_cli/dump/restore_impl.cpp
index f922da43c5..e1d586f06f 100644
--- a/ydb/public/lib/ydb_cli/dump/restore_impl.cpp
+++ b/ydb/public/lib/ydb_cli/dump/restore_impl.cpp
@@ -9,10 +9,11 @@
 #include <ydb/public/lib/ydb_cli/common/retry_func.h>
 #include <ydb/public/lib/ydb_cli/dump/files/files.h>
 #include <ydb/public/lib/ydb_cli/dump/util/log.h>
-#include <ydb/public/lib/ydb_cli/dump/util/rewrite_query.h>
+#include <ydb/public/lib/ydb_cli/dump/util/query_utils.h>
 #include <ydb/public/lib/ydb_cli/dump/util/util.h>
 #include <ydb/public/lib/ydb_cli/dump/util/view_utils.h>
 #include <ydb-cpp-sdk/client/proto/accessor.h>
+#include <yql/essentials/public/issue/yql_issue.h>
 
 #include <library/cpp/threading/future/core/future.h>
 
diff --git a/ydb/public/lib/ydb_cli/dump/util/query_utils.cpp b/ydb/public/lib/ydb_cli/dump/util/query_utils.cpp
new file mode 100644
index 0000000000..8e6e08211c
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/dump/util/query_utils.cpp
@@ -0,0 +1,273 @@
+#include "query_utils.h"
+
+#include <yql/essentials/parser/proto_ast/gen/v1/SQLv1Lexer.h>
+#include <yql/essentials/parser/proto_ast/gen/v1_proto_split/SQLv1Parser.pb.main.h>
+#include <yql/essentials/sql/settings/translation_settings.h>
+#include <yql/essentials/sql/v1/format/sql_format.h>
+#include <yql/essentials/sql/v1/proto_parser/proto_parser.h>
+#include <yql/essentials/public/issue/yql_issue.h>
+
+#include <library/cpp/protobuf/util/simple_reflection.h>
+
+#include <util/folder/pathsplit.h>
+#include <util/string/builder.h>
+#include <util/string/strip.h>
+
+#include <re2/re2.h>
+
+#include <format>
+
+namespace NYdb::NDump {
+
+using namespace NSQLv1Generated;
+
+TString RewriteAbsolutePath(TStringBuf path, TStringBuf backupRoot, TStringBuf restoreRoot) {
+    if (backupRoot == restoreRoot) {
+        return TString(path);
+    }
+
+    TPathSplitUnix pathSplit(path);
+    TPathSplitUnix backupRootSplit(backupRoot);
+
+    size_t matchedParts = 0;
+    while (matchedParts < pathSplit.size() && matchedParts < backupRootSplit.size()
+        && pathSplit[matchedParts] == backupRootSplit[matchedParts]
+    ) {
+        ++matchedParts;
+    }
+
+    TPathSplitUnix restoreRootSplit(restoreRoot);
+    for (size_t unmatchedParts = matchedParts + 1; unmatchedParts <= backupRootSplit.size(); ++unmatchedParts) {
+        restoreRootSplit.AppendComponent("..");
+    }
+
+    return restoreRootSplit.AppendMany(pathSplit.begin() + matchedParts, pathSplit.end()).Reconstruct();
+}
+
+namespace {
+
+struct TAbsolutePathRewriter {
+    const TStringBuf BackupRoot;
+    const TStringBuf RestoreRoot;
+
+    static bool IsAbsolutePath(TStringBuf path) {
+        return path.StartsWith("`/") && path.EndsWith('`');
+    }
+
+    TString RewriteAbsolutePath(TStringBuf path) const {
+        if (BackupRoot == RestoreRoot) {
+            return TString(path);
+        }
+
+        return TStringBuilder() << '`' << NDump::RewriteAbsolutePath(path.Skip(1).Chop(1), BackupRoot, RestoreRoot) << '`';
+    }
+
+public:
+    explicit TAbsolutePathRewriter(TStringBuf backupRoot, TStringBuf restoreRoot)
+        : BackupRoot(backupRoot)
+        , RestoreRoot(restoreRoot)
+    {
+    }
+
+    TString operator()(const TString& path) const {
+        if (IsAbsolutePath(path)) {
+            return RewriteAbsolutePath(path);
+        }
+
+        return path;
+    }
+};
+
+struct TTokenCollector {
+    explicit TTokenCollector(std::function<TString(const TString&)>&& pathRewriter = {})
+        : PathRewriter(std::move(pathRewriter))
+    {
+    }
+
+    void operator()(const NProtoBuf::Message& message) {
+        if (const auto* token = dynamic_cast<const TToken*>(&message)) {
+            const auto& value = token->GetValue();
+            if (token->GetId() != NALPDefault::SQLv1LexerTokens::TOKEN_EOF) {
+                if (!Tokens.empty()) {
+                    Tokens << ' ';
+                }
+                Tokens << (IsRefDescendent && PathRewriter ? PathRewriter(value) : value);
+            }
+        }
+    }
+
+    TStringBuilder Tokens;
+    bool IsRefDescendent = false;
+    std::function<TString(const TString&)> PathRewriter;
+};
+
+void VisitAllFields(const NProtoBuf::Message& msg, const std::function<bool(const NProtoBuf::Message&)>& callback) {
+    const auto* md = msg.GetDescriptor();
+    for (int i = 0; i < md->field_count(); ++i) {
+        const auto* fd = md->field(i);
+        NProtoBuf::TConstField field(msg, fd);
+        if (field.IsMessage()) {
+            for (size_t j = 0; j < field.Size(); ++j) {
+                const auto& message = *field.Get<NProtoBuf::Message>(j);
+                if (callback(message)) {
+                    VisitAllFields(message, callback);
+                }
+            }
+        }
+    }
+}
+
+template <typename TRef>
+void VisitAllFields(const NProtoBuf::Message& msg, TTokenCollector& callback) {
+    const auto* md = msg.GetDescriptor();
+    for (int i = 0; i < md->field_count(); ++i) {
+        const auto* fd = md->field(i);
+        NProtoBuf::TConstField field(msg, fd);
+        if (field.IsMessage()) {
+            for (size_t j = 0; j < field.Size(); ++j) {
+                const auto& message = *field.Get<NProtoBuf::Message>(j);
+                const auto* ref = dynamic_cast<const TRef*>(&message);
+                if (ref) {
+                    callback.IsRefDescendent = true;
+                }
+
+                callback(message);
+                VisitAllFields<TRef>(message, callback);
+
+                if (ref) {
+                    callback.IsRefDescendent = false;
+                }
+            }
+        }
+    }
+}
+
+struct TTableRefValidator {
+    // returns true if the message is not a table ref and we need to dive deeper to find it
+    bool operator()(const NProtoBuf::Message& message) {
+        const auto* ref = dynamic_cast<const TRule_table_ref*>(&message);
+        if (!ref) {
+            return true;
+        }
+
+        // implementation note: a better idea might be to create a custom grammar for validation
+        if (ref->HasBlock3() && ref->GetBlock3().HasAlt1() && ref->GetBlock3().GetAlt1().HasRule_table_key1()) {
+            // Table keys are considered save for view backups.
+            return false;
+        }
+
+        // The only kind of table references in views that we really cannot restore are evaluated absolute paths:
+        // $path = "/old_db" || "/t"; select * from $path;
+        // If the view is being restored to a different database (like "/new_db"),
+        // then the saved create view statement will need manual patching to succeed.
+        TTokenCollector tokenCollector;
+        VisitAllFields<TRule_table_ref>(*ref, tokenCollector);
+        const TString refString = tokenCollector.Tokens;
+
+        Issues.AddIssue(TStringBuilder() << "Please check that the reference: " << refString.Quote()
+            << " contains no evaluated expressions."
+        );
+        Issues.back().Severity = NYql::TSeverityIds::S_WARNING;
+
+        return false;
+    }
+
+    NYql::TIssues& Issues;
+};
+
+} // anonymous
+
+bool SqlToProtoAst(const TString& queryStr, TRule_sql_query& queryProto, NYql::TIssues& issues) {
+    NSQLTranslation::TTranslationSettings settings;
+    if (!NSQLTranslation::ParseTranslationSettings(queryStr, settings, issues)) {
+        return false;
+    }
+    if (settings.SyntaxVersion == 0) {
+        issues.AddIssue("cannot handle YQL syntax version 0");
+        return false;
+    }
+
+    google::protobuf::Arena arena;
+    const auto* parserProto = NSQLTranslationV1::SqlAST(
+        queryStr, "query", issues, 0, settings.AnsiLexer, settings.Antlr4Parser, settings.TestAntlr4, &arena
+    );
+    if (!parserProto) {
+        return false;
+    }
+
+    queryProto = static_cast<const TSQLv1ParserAST&>(*parserProto).GetRule_sql_query();
+    return true;
+}
+
+bool Format(const TString& query, TString& formattedQuery, NYql::TIssues& issues) {
+    google::protobuf::Arena arena;
+    NSQLTranslation::TTranslationSettings settings;
+    settings.Arena = &arena;
+
+    auto formatter = NSQLFormat::MakeSqlFormatter(settings);
+    return formatter->Format(query, formattedQuery, issues);
+}
+
+bool ValidateTableRefs(const TRule_sql_query& query, NYql::TIssues& issues) {
+    TTableRefValidator tableRefValidator(issues);
+    VisitAllFields(query, tableRefValidator);
+    return tableRefValidator.Issues.Empty();
+}
+
+template <typename TRef>
+TString RewriteRefs(const TRule_sql_query& query, TStringBuf backupRoot, TStringBuf restoreRoot) {
+    TTokenCollector tokenCollector(TAbsolutePathRewriter(backupRoot, restoreRoot));
+    VisitAllFields<TRef>(query, tokenCollector);
+    return tokenCollector.Tokens;
+}
+
+template <typename TRef>
+bool RewriteRefs(TString& queryStr, TStringBuf backupRoot, TStringBuf restoreRoot, NYql::TIssues& issues) {
+    TRule_sql_query queryProto;
+    if (!SqlToProtoAst(queryStr, queryProto, issues)) {
+        return false;
+    }
+
+    const auto rewrittenQuery = RewriteRefs<TRef>(queryProto, backupRoot, restoreRoot);
+    // formatting here is necessary for the view to have pretty text inside it after the creation
+    if (!Format(rewrittenQuery, queryStr, issues)) {
+        return false;
+    }
+
+    return true;
+}
+
+bool RewriteTableRefs(TString& query, TStringBuf backupRoot, TStringBuf restoreRoot, NYql::TIssues& issues) {
+    return RewriteRefs<TRule_table_ref>(query, backupRoot, restoreRoot, issues);
+}
+
+bool RewriteObjectRefs(TString& query, TStringBuf backupRoot, TStringBuf restoreRoot, NYql::TIssues& issues) {
+    return RewriteRefs<TRule_object_ref>(query, backupRoot, restoreRoot, issues);
+}
+
+bool RewriteCreateQuery(TString& query, std::string_view pattern, const std::string& dbPath, NYql::TIssues& issues) {
+    const auto searchPattern = std::vformat(pattern, std::make_format_args("\\S+"));
+    if (re2::RE2::Replace(&query, searchPattern, std::vformat(pattern, std::make_format_args(dbPath)))) {
+        return true;
+    }
+
+    issues.AddIssue(TStringBuilder() << "Pattern: \"" << pattern << "\" was not found: " << query.Quote());
+    return false;
+}
+
+TString GetBackupRoot(TStringInput query) {
+    constexpr TStringBuf targetLinePrefix = "-- backup root: \"";
+    constexpr TStringBuf discardedSuffix = "\"";
+
+    TString line;
+    while (query.ReadLine(line)) {
+        StripInPlace(line);
+        if (line.StartsWith(targetLinePrefix)) {
+            return TString(TStringBuf(line).Skip(targetLinePrefix.size()).Chop(discardedSuffix.size()));
+        }
+    }
+
+    return "";
+}
+
+} // NYdb::NDump
diff --git a/ydb/public/lib/ydb_cli/dump/util/query_utils.h b/ydb/public/lib/ydb_cli/dump/util/query_utils.h
new file mode 100644
index 0000000000..e14efd7e33
--- /dev/null
+++ b/ydb/public/lib/ydb_cli/dump/util/query_utils.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <util/generic/string.h>
+#include <util/stream/str.h>
+
+#include <string>
+#include <string_view>
+
+namespace NYql {
+    class TIssues;
+}
+
+namespace NSQLv1Generated {
+    class TRule_sql_query;
+}
+
+namespace NYdb::NDump {
+
+bool SqlToProtoAst(const TString& queryStr, NSQLv1Generated::TRule_sql_query& queryProto, NYql::TIssues& issues);
+bool Format(const TString& query, TString& formattedQuery, NYql::TIssues& issues);
+
+bool ValidateTableRefs(const NSQLv1Generated::TRule_sql_query& query, NYql::TIssues& issues);
+
+TString RewriteAbsolutePath(TStringBuf path, TStringBuf backupRoot, TStringBuf restoreRoot);
+bool RewriteTableRefs(TString& query, TStringBuf backupRoot, TStringBuf restoreRoot, NYql::TIssues& issues);
+bool RewriteObjectRefs(TString& query, TStringBuf backupRoot, TStringBuf restoreRoot, NYql::TIssues& issues);
+bool RewriteCreateQuery(TString& query, std::string_view pattern, const std::string& dbPath, NYql::TIssues& issues);
+
+TString GetBackupRoot(TStringInput query);
+
+}
diff --git a/ydb/public/lib/ydb_cli/dump/util/rewrite_query.cpp b/ydb/public/lib/ydb_cli/dump/util/rewrite_query.cpp
deleted file mode 100644
index d740056443..0000000000
--- a/ydb/public/lib/ydb_cli/dump/util/rewrite_query.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "rewrite_query.h"
-
-#include <util/string/builder.h>
-
-#include <re2/re2.h>
-
-#include <format>
-
-namespace NYdb::NDump {
-
-bool RewriteCreateQuery(TString& query, std::string_view pattern, const std::string& dbPath, NYql::TIssues& issues) {
-    const auto searchPattern = std::vformat(pattern, std::make_format_args("\\S+"));
-    if (re2::RE2::Replace(&query, searchPattern, std::vformat(pattern, std::make_format_args(dbPath)))) {
-        return true;
-    }
-
-    issues.AddIssue(TStringBuilder() << "Pattern: \"" << pattern << "\" was not found: " << query.Quote());
-    return false;
-}
-
-}
diff --git a/ydb/public/lib/ydb_cli/dump/util/rewrite_query.h b/ydb/public/lib/ydb_cli/dump/util/rewrite_query.h
deleted file mode 100644
index c2d8ea607e..0000000000
--- a/ydb/public/lib/ydb_cli/dump/util/rewrite_query.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <yql/essentials/public/issue/yql_issue.h>
-
-namespace NYdb::NDump {
-
-bool RewriteCreateQuery(TString& query, std::string_view pattern, const std::string& dbPath, NYql::TIssues& issues);
-
-}
diff --git a/ydb/public/lib/ydb_cli/dump/util/view_utils.cpp b/ydb/public/lib/ydb_cli/dump/util/view_utils.cpp
index 8980d2460c..8bd3a51324 100644
--- a/ydb/public/lib/ydb_cli/dump/util/view_utils.cpp
+++ b/ydb/public/lib/ydb_cli/dump/util/view_utils.cpp
@@ -1,185 +1,20 @@
-#include "rewrite_query.h"
+#include "query_utils.h"
 #include "view_utils.h"
 
 #include <yql/essentials/parser/proto_ast/gen/v1/SQLv1Lexer.h>
 #include <yql/essentials/parser/proto_ast/gen/v1_proto_split/SQLv1Parser.pb.main.h>
-#include <yql/essentials/sql/settings/translation_settings.h>
-#include <yql/essentials/sql/v1/format/sql_format.h>
-#include <yql/essentials/sql/v1/proto_parser/proto_parser.h>
+#include <yql/essentials/public/issue/yql_issue.h>
 
-#include <library/cpp/protobuf/util/simple_reflection.h>
-
-#include <util/folder/pathsplit.h>
 #include <util/string/builder.h>
-#include <util/string/strip.h>
 
-#include <format>
 #include <re2/re2.h>
 
+namespace NYdb::NDump {
+
 using namespace NSQLv1Generated;
 
 namespace {
 
-TString RewriteAbsolutePath(TStringBuf path, TStringBuf backupRoot, TStringBuf restoreRoot) {
-    if (backupRoot == restoreRoot) {
-        return TString(path);
-    }
-
-    TPathSplitUnix pathSplit(path);
-    TPathSplitUnix backupRootSplit(backupRoot);
-
-    size_t matchedParts = 0;
-    while (matchedParts < pathSplit.size() && matchedParts < backupRootSplit.size()
-        && pathSplit[matchedParts] == backupRootSplit[matchedParts]
-    ) {
-        ++matchedParts;
-    }
-
-    TPathSplitUnix restoreRootSplit(restoreRoot);
-    for (size_t unmatchedParts = matchedParts + 1; unmatchedParts <= backupRootSplit.size(); ++unmatchedParts) {
-        restoreRootSplit.AppendComponent("..");
-    }
-    return restoreRootSplit.AppendMany(pathSplit.begin() + matchedParts, pathSplit.end()).Reconstruct();
-}
-
-struct TAbsolutePathRewriter {
-
-    static bool IsAbsolutePath(TStringBuf path) {
-        return path.StartsWith("`/") && path.EndsWith('`');
-    }
-
-    TString RewriteAbsolutePath(const TString& path) const {
-        if (BackupRoot == RestoreRoot) {
-            return path;
-        }
-
-        return TStringBuilder() << '`'
-            << ::RewriteAbsolutePath(TStringBuf(path.begin() + 1, path.end() - 1), BackupRoot, RestoreRoot)
-            << '`';
-    }
-
-    TString operator()(const TString& path) const {
-        if (IsAbsolutePath(path)) {
-            return RewriteAbsolutePath(path);
-        }
-        return path;
-    }
-
-    TStringBuf BackupRoot;
-    TStringBuf RestoreRoot;
-};
-
-struct TTokenCollector {
-    TTokenCollector(std::function<TString(const TString&)>&& pathRewriter = {}) : PathRewriter(std::move(pathRewriter)) {}
-
-    void operator()(const NProtoBuf::Message& message) {
-        if (const auto* token = dynamic_cast<const TToken*>(&message)) {
-            const auto& value = token->GetValue();
-            if (token->GetId() != NALPDefault::SQLv1LexerTokens::TOKEN_EOF) {
-                if (!Tokens.empty()) {
-                    Tokens << ' ';
-                }
-                Tokens << (IsTableRefDescendent && PathRewriter ? PathRewriter(value) : value);
-            }
-        }
-    }
-
-    TStringBuilder Tokens;
-
-    bool IsTableRefDescendent = false;
-    std::function<TString(const TString&)> PathRewriter;
-};
-
-void VisitAllFields(const NProtoBuf::Message& msg, const std::function<bool(const NProtoBuf::Message&)>& callback) {
-    const auto* descr = msg.GetDescriptor();
-    for (int i = 0; i < descr->field_count(); ++i) {
-        const auto* fd = descr->field(i);
-        NProtoBuf::TConstField field(msg, fd);
-        if (field.IsMessage()) {
-            for (size_t j = 0; j < field.Size(); ++j) {
-                const auto& message = *field.Get<NProtoBuf::Message>(j);
-                if (callback(message)) {
-                    VisitAllFields(message, callback);
-                }
-            }
-        }
-    }
-}
-
-void VisitAllFields(const NProtoBuf::Message& msg, TTokenCollector& callback) {
-    const auto* descr = msg.GetDescriptor();
-    for (int i = 0; i < descr->field_count(); ++i) {
-        const auto* fd = descr->field(i);
-        NProtoBuf::TConstField field(msg, fd);
-        if (field.IsMessage()) {
-            for (size_t j = 0; j < field.Size(); ++j) {
-                const auto& message = *field.Get<NProtoBuf::Message>(j);
-                const auto* tableRef = dynamic_cast<const TRule_table_ref*>(&message);
-                if (tableRef) {
-                    callback.IsTableRefDescendent = true;
-                }
-
-                callback(message);
-                VisitAllFields(message, callback);
-
-                if (tableRef) {
-                    callback.IsTableRefDescendent = false;
-                }
-            }
-        }
-    }
-}
-
-struct TTableRefValidator {
-
-    // returns true if the message is not a table ref and we need to dive deeper to find it
-    bool operator()(const NProtoBuf::Message& message) {
-        const auto* tableRef = dynamic_cast<const TRule_table_ref*>(&message);
-        if (!tableRef) {
-            return true;
-        }
-
-        // implementation note: a better idea might be to create a custom grammar for validation
-        if (tableRef->HasBlock3() && tableRef->GetBlock3().HasAlt1() && tableRef->GetBlock3().GetAlt1().HasRule_table_key1()) {
-            // Table keys are considered save for view backups.
-            return false;
-        }
-
-        // The only kind of table references in views that we really cannot restore are evaluated absolute paths:
-        // $path = "/old_db" || "/t"; select * from $path;
-        // If the view is being restored to a different database (like "/new_db"),
-        // then the saved create view statement will need manual patching to succeed.
-        TTokenCollector tokenCollector;
-        VisitAllFields(*tableRef, tokenCollector);
-        const TString refString = tokenCollector.Tokens;
-
-        Issues.AddIssue(TStringBuilder() << "Please check that the table reference: " << refString.Quote()
-            << " contains no evaluated expressions."
-        );
-        Issues.back().Severity = NYql::TSeverityIds::S_WARNING;
-
-        return false;
-    }
-
-    NYql::TIssues& Issues;
-};
-
-bool ValidateTableRefs(const TRule_sql_query& query, NYql::TIssues& issues) {
-    TTableRefValidator tableRefValidator(issues);
-    VisitAllFields(query, tableRefValidator);
-    return tableRefValidator.Issues.Empty();
-}
-
-TString RewriteTableRefs(const TRule_sql_query& query, TStringBuf backupRoot, TStringBuf restoreRoot) {
-    TAbsolutePathRewriter pathRewriter;
-    pathRewriter.BackupRoot = backupRoot;
-    pathRewriter.RestoreRoot = restoreRoot;
-
-    TTokenCollector tokenCollector(std::move(pathRewriter));
-    VisitAllFields(query, tokenCollector);
-    return tokenCollector.Tokens;
-}
-
 struct TViewQuerySplit {
     TString ContextRecreation;
     TString Select;
@@ -200,28 +35,6 @@ TViewQuerySplit SplitViewQuery(TStringInput query) {
     return split;
 }
 
-bool SqlToProtoAst(const TString& query, TRule_sql_query& queryProto, NYql::TIssues& issues) {
-    NSQLTranslation::TTranslationSettings settings;
-    if (!NSQLTranslation::ParseTranslationSettings(query, settings, issues)) {
-        return false;
-    }
-    if (settings.SyntaxVersion == 0) {
-        issues.AddIssue("cannot handle YQL syntax version 0");
-        return false;
-    }
-
-    google::protobuf::Arena arena;
-    const auto* parserProto = NSQLTranslationV1::SqlAST(
-        query, "query", issues, 0, settings.AnsiLexer, settings.Antlr4Parser, settings.TestAntlr4, &arena
-    );
-    if (!parserProto) {
-        return false;
-    }
-
-    queryProto = static_cast<const TSQLv1ParserAST&>(*parserProto).GetRule_sql_query();
-    return true;
-}
-
 bool ValidateViewQuery(const TString& query, NYql::TIssues& issues) {
     TRule_sql_query queryProto;
     if (!SqlToProtoAst(query, queryProto, issues)) {
@@ -247,48 +60,6 @@ void ValidateViewQuery(const TString& query, const TString& dbPath, NYql::TIssue
     }
 }
 
-TString GetBackupRoot(TStringInput query) {
-    TString backupRoot;
-
-    constexpr TStringBuf targetLinePrefix = "-- backup root: \"";
-    constexpr TStringBuf discardedSuffix = "\"";
-    TString line;
-    while (query.ReadLine(line)) {
-        StripInPlace(line);
-        if (line.StartsWith(targetLinePrefix)) {
-            backupRoot = line.substr(
-                std::size(targetLinePrefix),
-                std::size(line) - std::size(targetLinePrefix) - std::size(discardedSuffix)
-            );
-            return backupRoot;
-        }
-    }
-
-    return backupRoot;
-}
-
-bool Format(const TString& query, TString& formattedQuery, NYql::TIssues& issues) {
-    google::protobuf::Arena arena;
-    NSQLTranslation::TTranslationSettings settings;
-    settings.Arena = &arena;
-
-    auto formatter = NSQLFormat::MakeSqlFormatter(settings);
-    return formatter->Format(query, formattedQuery, issues);
-}
-
-bool RewriteTableRefs(TString& query, TStringBuf backupRoot, TStringBuf restoreRoot, NYql::TIssues& issues) {
-    TRule_sql_query queryProto;
-    if (!SqlToProtoAst(query, queryProto, issues)) {
-        return false;
-    }
-    const auto rewrittenQuery = RewriteTableRefs(queryProto, backupRoot, restoreRoot);
-    // formatting here is necessary for the view to have pretty text inside it after the creation
-    if (!Format(rewrittenQuery, query, issues)) {
-        return false;
-    }
-    return true;
-}
-
 bool RewriteTablePathPrefix(TString& query, TStringBuf backupRoot, TStringBuf restoreRoot,
     bool restoreRootIsDatabase, NYql::TIssues& issues
 ) {
@@ -331,9 +102,7 @@ bool RewriteTablePathPrefix(TString& query, TStringBuf backupRoot, TStringBuf re
     return true;
 }
 
-}
-
-namespace NYdb::NDump {
+} // anonymous
 
 TString BuildCreateViewQuery(
     const TString& name, const TString& dbPath, const TString& viewQuery, const TString& backupRoot,
@@ -377,4 +146,4 @@ bool RewriteCreateViewQuery(TString& query, const TString& restoreRoot, bool res
     return RewriteCreateQuery(query, "CREATE VIEW IF NOT EXISTS `{}`", dbPath, issues);
 }
 
-}
+} // NYdb::NDump
diff --git a/ydb/public/lib/ydb_cli/dump/util/view_utils.h b/ydb/public/lib/ydb_cli/dump/util/view_utils.h
index 98167aa9d9..34825299c1 100644
--- a/ydb/public/lib/ydb_cli/dump/util/view_utils.h
+++ b/ydb/public/lib/ydb_cli/dump/util/view_utils.h
@@ -1,4 +1,10 @@
-#include <yql/essentials/public/issue/yql_issue.h>
+#pragma once
+
+#include <util/generic/string.h>
+
+namespace NYql {
+    class TIssues;
+}
 
 namespace NYdb::NDump {
 
diff --git a/ydb/public/lib/ydb_cli/dump/util/ya.make b/ydb/public/lib/ydb_cli/dump/util/ya.make
index 22343c95cd..e3375faedf 100644
--- a/ydb/public/lib/ydb_cli/dump/util/ya.make
+++ b/ydb/public/lib/ydb_cli/dump/util/ya.make
@@ -1,13 +1,12 @@
 LIBRARY()
 
 SRCS(
-    rewrite_query.cpp
+    query_utils.cpp
     util.cpp
     view_utils.cpp
 )
 
 PEERDIR(
-    library/cpp/protobuf/util
     ydb/public/lib/ydb_cli/common
     ydb/public/sdk/cpp/src/client/scheme
     ydb/public/sdk/cpp/src/client/table
@@ -17,6 +16,7 @@ PEERDIR(
     yql/essentials/sql/settings
     yql/essentials/sql/v1/format
     yql/essentials/sql/v1/proto_parser
+    library/cpp/protobuf/util
 )
 
 END()
author	Ilnaz Nizametdinov <ilnaz@ydb.tech>	2025-02-12 18:03:00 +0300
committer	GitHub <noreply@github.com>	2025-02-12 15:03:00 +0000
commit	b9ac376799be591d848e3dcc8e738c207339b484 (patch)
tree	48ccf1d284954d10c75c05ab119367990601cf72
parent	b4819809e2e77584b75f9788f09fd793019ed3bd (diff)
download	ydb-b9ac376799be591d848e3dcc8e738c207339b484.tar.gz