Merge 301360c into 1ef5236

Author: nepal

ydb/library/yql/sql/v1/builtin.cpp

@@ -1399,7 +1399,7 @@ class TYqlCallableType final : public TCallNode {
             return false;
         }
 
-        if (!dynamic_cast<TTupleNode*>(Args[0].Get())) {
+        if (!Args[0]->GetTupleNode()) {
             ui32 numOptArgs;
             if (!Parseui32(Args[0], numOptArgs)) {
                 ctx.Error(Args[0]->GetPos()) << "Expected either tuple or number of optional arguments";
@@ -1409,12 +1409,12 @@ class TYqlCallableType final : public TCallNode {
             Args[0] = Q(Y(BuildQuotedAtom(Args[0]->GetPos(), ToString(numOptArgs))));
         }
 
-        if (!dynamic_cast<TTupleNode*>(Args[1].Get())) {
+        if (!Args[1]->GetTupleNode()) {
             Args[1] = Q(Y(Args[1]));
         }
 
         for (ui32 index = 2; index < Args.size(); ++index) {
-            if (!dynamic_cast<TTupleNode*>(Args[index].Get())) {
+            if (!Args[index]->GetTupleNode()) {
                 Args[index] = Q(Y(Args[index]));
             }
         }
@@ -2300,7 +2300,7 @@ TNodePtr BuildSqlCall(TContext& ctx, TPosition pos, const TString& module, const
     TVector<TNodePtr> sqlCallArgs;
     sqlCallArgs.push_back(BuildQuotedAtom(pos, fullName));
     if (namedArgs) {
-        auto tupleNodePtr = dynamic_cast<const TTupleNode*>(positionalArgs.Get());
+        auto tupleNodePtr = positionalArgs->GetTupleNode();
         YQL_ENSURE(tupleNodePtr);
         TNodePtr positionalArgsNode = new TCallNodeImpl(pos, "PositionalArgs", tupleNodePtr->Elements());
         sqlCallArgs.push_back(BuildTuple(pos, { positionalArgsNode, namedArgs }));
@@ -2484,7 +2484,7 @@ class TScriptUdf final: public INode {
             return false;
         }
         auto scriptStrPtr = Args.back()->GetLiteral("String");
-        if (scriptStrPtr && scriptStrPtr->size() > SQL_MAX_INLINE_SCRIPT_LEN) {
+        if (!ctx.CompactNamedExprs && scriptStrPtr && scriptStrPtr->size() > SQL_MAX_INLINE_SCRIPT_LEN) {
             scriptNode = ctx.UniversalAlias("scriptudf", std::move(scriptNode));
         }
 
@@ -3438,9 +3438,9 @@ TNodePtr BuildBuiltinFunc(TContext& ctx, TPosition pos, TString name, const TVec
             };
         };
 
-        auto structNode = dynamic_cast<TStructNode*>(args[0].Get());
+        auto structNode = args[0]->GetStructNode();
         if (!structNode) {
-            if (auto callNode = dynamic_cast<TCallNode*>(args[0].Get())) {
+            if (auto callNode = args[0]->GetCallNode()) {
                 if (callNode->GetOpName() == "AsStruct") {
                     return BuildUdf(ctx, pos, nameSpace, name, makeUdfArgs());
                 }
@@ -3452,7 +3452,7 @@ TNodePtr BuildBuiltinFunc(TContext& ctx, TPosition pos, TString name, const TVec
         for (const auto& item : structNode->GetExprs()) {
             const auto& label = item->GetLabel();
             if (label == "Entities") {
-                auto callNode = dynamic_cast<TCallNode*>(item.Get());
+                auto callNode = item->GetCallNode();
                 if (!callNode || callNode->GetOpName() != "AsListMayWarn") {
                     return new TInvalidBuiltin(pos, TStringBuilder() << name << " entities must be list of strings");
                 }
@@ -3627,14 +3627,14 @@ TNodePtr BuildBuiltinFunc(TContext& ctx, TPosition pos, TString name, const TVec
             if (mustUseNamed && *mustUseNamed) {
                 *mustUseNamed = false;
                 YQL_ENSURE(args.size() == 2);
-                Y_DEBUG_ABORT_UNLESS(dynamic_cast<TTupleNode*>(args[0].Get()));
-                auto posArgs = static_cast<TTupleNode*>(args[0].Get());
+                Y_DEBUG_ABORT_UNLESS(args[0]->GetTupleNode());
+                auto posArgs = args[0]->GetTupleNode();
                 if (posArgs->IsEmpty()) {
                     if (normalizedName == "asstruct") {
                         return args[1];
                     } else {
-                        Y_DEBUG_ABORT_UNLESS(dynamic_cast<TStructNode*>(args[1].Get()));
-                        auto namedArgs = static_cast<TStructNode*>(args[1].Get());
+                        Y_DEBUG_ABORT_UNLESS(args[1]->GetStructNode());
+                        auto namedArgs = args[1]->GetStructNode();
                         return new TStructTypeNode(pos, namedArgs->GetExprs());
                     }
                 }
@@ -3650,9 +3650,9 @@ TNodePtr BuildBuiltinFunc(TContext& ctx, TPosition pos, TString name, const TVec
                 *mustUseNamed = false;
             }
             YQL_ENSURE(args.size() == 2);
-            auto posArgs = static_cast<TTupleNode*>(args[0].Get());
-            Y_DEBUG_ABORT_UNLESS(dynamic_cast<TTupleNode*>(args[0].Get()));
-            Y_DEBUG_ABORT_UNLESS(dynamic_cast<TStructNode*>(args[1].Get()));
+            Y_DEBUG_ABORT_UNLESS(args[0]->GetTupleNode());
+            Y_DEBUG_ABORT_UNLESS(args[1]->GetStructNode());
+            auto posArgs = args[0]->GetTupleNode();
             if (posArgs->GetTupleSize() != 1) {
                 return new TInvalidBuiltin(pos, TStringBuilder() << "ExpandStruct requires all arguments except first to be named");
             }
@@ -3737,7 +3737,7 @@ TNodePtr BuildBuiltinFunc(TContext& ctx, TPosition pos, TString name, const TVec
 
     if (ns == "datetime2" && name == "Update") {
         if (namedArgs) {
-            TStructNode* castedNamedArgs = dynamic_cast<TStructNode*>(namedArgs.Get());
+            TStructNode* castedNamedArgs = namedArgs->GetStructNode();
             Y_DEBUG_ABORT_UNLESS(castedNamedArgs);
             auto exprs = castedNamedArgs->GetExprs();
             for (auto& arg : exprs) {

ydb/library/yql/sql/v1/context.cpp

@@ -60,6 +60,7 @@ THashMap<TStringBuf, TPragmaField> CTX_PRAGMA_FIELDS = {
     {"BlockEngineEnable", &TContext::BlockEngineEnable},
     {"BlockEngineForce", &TContext::BlockEngineForce},
     {"UnorderedResult", &TContext::UnorderedResult},
+    {"CompactNamedExprs", &TContext::CompactNamedExprs},
 };
 
 typedef TMaybe<bool> TContext::*TPragmaMaybeField;
@@ -413,6 +414,9 @@ const TVector<std::pair<TString, TDeferredAtom>>& TScopedState::GetUsedClusters(
 TNodePtr TScopedState::WrapCluster(const TDeferredAtom& cluster, TContext& ctx) {
     auto node = cluster.Build();
     if (!cluster.GetLiteral()) {
+        if (ctx.CompactNamedExprs) {
+            return node->Y("EvaluateAtom", node);
+        }
         AddExprCluster(node, ctx);
         auto exprIt = Local.ExprClustersMap.find(node.Get());
         YQL_ENSURE(exprIt != Local.ExprClustersMap.end());

ydb/library/yql/sql/v1/context.h

@@ -315,6 +315,7 @@ namespace NSQLTranslationV1 {
         bool BlockEngineForce = false;
         bool UnorderedResult = false;
         ui64 ParallelModeCount = 0;
+        bool CompactNamedExprs = false;
     };
 
     class TColumnRefScope {

ydb/library/yql/sql/v1/join.cpp

@@ -218,7 +218,7 @@ class TJoinBase: public IJoin {
                 return false;
             }
 
-            op = dynamic_cast<const TCallNode*>(expr.Get());
+            op = expr->GetCallNode();
             YQL_ENSURE(op, "Invalid JOIN equal operation node");
             YQL_ENSURE(op->GetArgs().size() == 2, "Invalid JOIN equal operation arguments");
         }
@@ -441,7 +441,7 @@ bool TJoinBase::DoInit(TContext& ctx, ISource* initSrc) {
                 TNodePtr cur = conjQueue.front();
                 conjQueue.pop_front();
                 if (cur->GetOpName() == "And") {
-                    auto conj = dynamic_cast<const TCallNode*>(cur.Get());
+                    auto conj = cur->GetCallNode();
                     YQL_ENSURE(conj, "Invalid And operation node");
                     conjQueue.insert(conjQueue.begin(), conj->GetArgs().begin(), conj->GetArgs().end());
                 } else if (!InitKeysOrFilters(ctx, idx, cur)) {