25-1, VIEW: use parent context for query AST building (#15568)

Author: jepett0

ydb/core/kqp/ut/view/input/cases/udf/create_view.sql

@@ -0,0 +1,4 @@
+CREATE VIEW `view_with_udf` WITH (security_invoker = TRUE) AS
+    SELECT
+        "bbb" LIKE Unwrap("aaa")
+;

ydb/core/kqp/ut/view/input/cases/udf/drop_view.sql

@@ -0,0 +1 @@
+DROP VIEW `view_with_udf`;

ydb/core/kqp/ut/view/input/cases/udf/etalon_query.sql

@@ -0,0 +1,6 @@
+SELECT
+    *
+FROM (
+    SELECT
+        "bbb" LIKE Unwrap("aaa")
+);

ydb/core/kqp/ut/view/input/cases/udf/select_from_view.sql

@@ -0,0 +1,5 @@
+SELECT
+    *
+FROM
+    `view_with_udf`
+;

yql/essentials/sql/v1/object_processing.cpp

@@ -57,6 +57,26 @@ INode::TPtr TCreateObject::FillFeatures(INode::TPtr options) const {
     return options;
 }
 
+namespace {
+
+bool InitFeatures(TContext& ctx, ISource* src, std::map<TString, TDeferredAtom>& features) {
+    for (auto& [key, value] : features) {
+        if (value.HasNode() && !value.Build()->Init(ctx, src)) {
+            return false;
+        }
+    }
+    return true;
+}
+
+}
+
+bool TCreateObject::DoInit(TContext& ctx, ISource* src) {
+    if (!InitFeatures(ctx, src, Features)) {
+        return false;
+    }
+    return TObjectProcessorImpl::DoInit(ctx, src);
+}
+
 TObjectOperatorContext::TObjectOperatorContext(TScopedStatePtr scoped)
     : Scoped(scoped)
     , ServiceId(Scoped->CurrService)

yql/essentials/sql/v1/object_processing.h

@@ -55,6 +55,7 @@ class TCreateObject: public TObjectProcessorImpl {
         return Y(Q(Y(Q("mode"), Q(mode))));
     }
     virtual INode::TPtr FillFeatures(INode::TPtr options) const override;
+    bool DoInit(TContext& ctx, ISource* src) override;
 public:
     TCreateObject(TPosition pos, const TString& objectId,
         const TString& typeId, bool existingOk, bool replaceIfExists, std::map<TString, TDeferredAtom>&& features, std::set<TString>&& featuresToReset, const TObjectOperatorContext& context)

yql/essentials/sql/v1/sql_translation.cpp

@@ -20,6 +20,8 @@ namespace {
 
 using namespace NSQLTranslationV1;
 
+using NSQLTranslation::ESqlMode;
+
 template <typename Callback>
 void VisitAllFields(const NProtoBuf::Message& msg, Callback& callback) {
     const auto* descr = msg.GetDescriptor();
@@ -55,68 +57,49 @@ TString CollectTokens(const TRule_select_stmt& selectStatement) {
     return tokenCollector.Tokens;
 }
 
-bool RecreateContext(
-    TContext& ctx, const NSQLTranslation::TTranslationSettings& settings, const TString& recreationQuery
-) {
-    if (!recreationQuery) {
-        return true;
-    }
-    const TString queryName = "context recreation query";
-
-    const auto* ast = NSQLTranslationV1::SqlAST(
-        ctx.Parsers,
-        recreationQuery, queryName, ctx.Issues,
-        settings.MaxErrors, settings.AnsiLexer,  settings.Antlr4Parser, settings.Arena
-    );
-    if (!ast) {
+bool BuildContextRecreationQuery(TContext& context, TStringBuilder& query) {
+    TVector<TString> statements;
+    if (!SplitQueryToStatements(context.Lexers, context.Parsers, context.Query, statements, context.Issues, context.Settings)) {
         return false;
     }
 
-    TSqlQuery queryTranslator(ctx, ctx.Settings.Mode, true);
-    auto node = queryTranslator.Build(static_cast<const TSQLv1ParserAST&>(*ast));
-
-    return node && node->Init(ctx, nullptr) && node->Translate(ctx);
+    for (size_t id : context.ForAllStatementsParts) {
+        query << statements[id] << '\n';
+    }
+    return true;
 }
 
-TNodePtr BuildViewSelect(
-    const TRule_select_stmt& selectStatement,
-    TContext& parentContext,
-    const TString& contextRecreationQuery
-) {
-    TIssues issues;
-    TContext context(parentContext.Lexers, parentContext.Parsers, parentContext.Settings, {}, issues, parentContext.Query);
-    if (!RecreateContext(context, context.Settings, contextRecreationQuery)) {
-        parentContext.Issues.AddIssues(issues);
-        return nullptr;
-    }
-    issues.Clear();
+// ensures that the parsing mode is restored to the original value
+class TModeGuard {
+    ESqlMode& Mode;
+    ESqlMode OriginalMode;
 
-    // Holds (among other things) subquery references.
-    // These references need to be passed to the parent context
-    // to be able to compile view queries with subqueries.
-    context.PushCurrentBlocks(&parentContext.GetCurrentBlocks());
+public:
+    TModeGuard(ESqlMode& mode, ESqlMode newMode)
+        : Mode(mode)
+        , OriginalMode(std::exchange(mode, newMode))
+    {}
 
-    context.Settings.Mode = NSQLTranslation::ESqlMode::LIMITED_VIEW;
+    ~TModeGuard() {
+        Mode = OriginalMode;
+    }
+};
 
+TNodePtr BuildViewSelect(const TRule_select_stmt& selectStatement, TContext& context) {
+    TModeGuard guard(context.Settings.Mode, ESqlMode::LIMITED_VIEW);
     TSqlSelect selectTranslator(context, context.Settings.Mode);
-    TPosition pos = parentContext.Pos();
-    auto source = selectTranslator.Build(selectStatement, pos);
+    auto position = context.Pos();
+    auto source = selectTranslator.Build(selectStatement, position);
     if (!source) {
-        parentContext.Issues.AddIssues(issues);
         return nullptr;
     }
-    auto node = BuildSelectResult(
-        pos,
-        std::move(source),
-        false,
-        false,
+    return BuildSelectResult(
+        position,
+        source,
+        false, /* write result */
+        false, /* in subquery */
         context.Scoped
     );
-    if (!node) {
-        parentContext.Issues.AddIssues(issues);
-        return nullptr;
-    }
-    return node;
 }
 
 }
@@ -5130,32 +5113,20 @@ bool TSqlTranslation::ParseViewQuery(
     std::map<TString, TDeferredAtom>& features,
     const TRule_select_stmt& query
 ) {
-    TString queryText = CollectTokens(query);
-    TString contextRecreationQuery;
-    {
-        const auto& service = Ctx.Scoped->CurrService;
-        const auto& cluster = Ctx.Scoped->CurrCluster;
-        const auto effectivePathPrefix = Ctx.GetPrefixPath(service, cluster);
-
-        // TO DO: capture all runtime pragmas in a similar fashion.
-        if (effectivePathPrefix != Ctx.Settings.PathPrefix) {
-            contextRecreationQuery = TStringBuilder() << "PRAGMA TablePathPrefix = \"" << effectivePathPrefix << "\";\n";
-        }
-
-        // TO DO: capture other compilation-affecting statements except USE.
-        if (cluster.GetLiteral() && *cluster.GetLiteral() != Ctx.Settings.DefaultCluster) {
-            contextRecreationQuery = TStringBuilder() << "USE " << *cluster.GetLiteral() << ";\n";
-        }
+    TStringBuilder queryText;
+    if (!BuildContextRecreationQuery(Ctx, queryText)) {
+        return false;
     }
-    features["query_text"] = { Ctx.Pos(), contextRecreationQuery + queryText };
+    queryText << CollectTokens(query);
+    features["query_text"] = { Ctx.Pos(), queryText };
 
-    // AST is needed for ready-made validation of CREATE VIEW statement.
-    // Query is stored as plain text, not AST.
-    const auto viewSelect = BuildViewSelect(query, Ctx, contextRecreationQuery);
+    // The AST is needed solely for the validation of the CREATE VIEW statement.
+    // The final storage format for the query is a plain text, not an AST.
+    const auto viewSelect = BuildViewSelect(query, Ctx);
     if (!viewSelect) {
         return false;
     }
-    features["query_ast"] = {viewSelect, Ctx};
+    features["query_ast"] = { viewSelect, Ctx };
 
     return true;
 }

yql/essentials/sql/v1/sql_ut.cpp

@@ -7392,6 +7392,15 @@ Y_UNIT_TEST_SUITE(TViewSyntaxTest) {
         UNIT_ASSERT_C(res.Root, res.Issues.ToString());
     }
 
+    Y_UNIT_TEST(CreateViewWithUdfs) {
+        NYql::TAstParseResult res = SqlToYql(R"(
+                USE plato;
+                CREATE VIEW TheView WITH (security_invoker = TRUE) AS SELECT "bbb" LIKE Unwrap("aaa");
+            )"
+        );
+        UNIT_ASSERT_C(res.Root, res.Issues.ToString());
+    }
+
     Y_UNIT_TEST(CreateViewIfNotExists) {
         constexpr const char* name = "TheView";
         NYql::TAstParseResult res = SqlToYql(std::format(R"(

yql/essentials/sql/v1/sql_ut_antlr4.cpp

@@ -7389,6 +7389,15 @@ Y_UNIT_TEST_SUITE(TViewSyntaxTest) {
         UNIT_ASSERT_C(res.Root, res.Issues.ToString());
     }
 
+    Y_UNIT_TEST(CreateViewWithUdfs) {
+        NYql::TAstParseResult res = SqlToYql(R"(
+                USE plato;
+                CREATE VIEW TheView WITH (security_invoker = TRUE) AS SELECT "bbb" LIKE Unwrap("aaa");
+            )"
+        );
+        UNIT_ASSERT_C(res.Root, res.Issues.ToString());
+    }
+
     Y_UNIT_TEST(CreateViewIfNotExists) {
         constexpr const char* name = "TheView";
         NYql::TAstParseResult res = SqlToYql(std::format(R"(