Skip to content

allow free arguments in FormatCode #2153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2024
Merged

allow free arguments in FormatCode #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ydb/library/yql/ast/yql_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,6 +1707,8 @@ namespace {
TExprContext& Expr;
size_t Order = 0ULL;
bool RefAtoms = false;
bool AllowFreeArgs = false;
TNodeMap<size_t> FreeArgs;
std::unique_ptr<TMemoryPool> Pool;
std::vector<TFrameContext> Frames;
TFrameContext* CurrentFrame = nullptr;
Expand Down Expand Up @@ -1960,6 +1962,12 @@ namespace {
case TExprNode::World:
res = TAstNode::NewLiteralAtom(ctx.Expr.GetPosition(node.Pos()), TStringBuf("world"), pool);
break;
case TExprNode::Argument: {
YQL_ENSURE(ctx.AllowFreeArgs, "Free arguments are not allowed");
auto iter = ctx.FreeArgs.emplace(&node, ctx.FreeArgs.size());
res = TAstNode::NewLiteralAtom(ctx.Expr.GetPosition(node.Pos()), ctx.Expr.AppendString("_FreeArg" + ToString(iter.first->second)), pool);
break;
}
default:
YQL_ENSURE(false, "Unknown type: " << static_cast<ui32>(node.Type()));
}
Expand Down Expand Up @@ -2703,6 +2711,7 @@ TAstParseResult ConvertToAst(const TExprNode& root, TExprContext& exprContext, c
#endif
TVisitNodeContext ctx(exprContext);
ctx.RefAtoms = settings.RefAtoms;
ctx.AllowFreeArgs = settings.AllowFreeArgs;
ctx.Pool = std::make_unique<TMemoryPool>(4096);
ctx.Frames.push_back(TFrameContext());
ctx.CurrentFrame = &ctx.Frames.front();
Expand Down
1 change: 1 addition & 0 deletions ydb/library/yql/ast/yql_expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,6 +2799,7 @@ struct TConvertToAstSettings {
bool RefAtoms = false;
std::function<bool(const TExprNode&)> NoInlineFunc;
bool PrintArguments = false;
bool AllowFreeArgs = false;
};

TAstParseResult ConvertToAst(const TExprNode& root, TExprContext& ctx, const TConvertToAstSettings& settings);
Expand Down
8 changes: 6 additions & 2 deletions ydb/library/yql/providers/common/comp_nodes/yql_formatcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ class TFormatCodeWrapper : public TMutableComputationNode<TFormatCodeWrapper> {
auto codeValue = Code_->GetValue(ctx);
auto code = GetYqlCode(codeValue);
NYql::TExprContext& exprCtx = GetExprContext(ctx, ExprCtxMutableIndex_);
auto ast = NYql::ConvertToAst(*code, exprCtx, AnnotatePosition_ ?
NYql::TConvertToAstSettings settings;
settings.AnnotationFlags = AnnotatePosition_ ?
NYql::TExprAnnotationFlags::Position :
NYql::TExprAnnotationFlags::None, true);
NYql::TExprAnnotationFlags::None;
settings.RefAtoms = true;
settings.AllowFreeArgs = true;
auto ast = NYql::ConvertToAst(*code, exprCtx, settings);
auto str = ast.Root->ToString(NYql::TAstPrintFlags::PerLine | NYql::TAstPrintFlags::ShortQuote);
return MakeString(str);
}
Expand Down
22 changes: 22 additions & 0 deletions ydb/library/yql/tests/sql/dq_file/part7/canondata/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,28 @@
}
],
"test.test[action-eval_taggedtype-default.txt-Results]": [],
"test.test[action-runtime_format_free_args_code-default.txt-Analyze]": [
{
"checksum": "b4dd508a329723c74293d80f0278c705",
"size": 505,
"uri": "https://{canondata_backend}/1600758/6a579ce429b85915b6ff135574bc65e433d5b02a/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Analyze_/plan.txt"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Debug]": [
{
"checksum": "d11f5c76a7048faa245983179ba1ad04",
"size": 320,
"uri": "https://{canondata_backend}/1600758/6a579ce429b85915b6ff135574bc65e433d5b02a/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Debug_/opt.yql_patched"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Plan]": [
{
"checksum": "b4dd508a329723c74293d80f0278c705",
"size": 505,
"uri": "https://{canondata_backend}/1600758/6a579ce429b85915b6ff135574bc65e433d5b02a/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Plan_/plan.txt"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Results]": [],
"test.test[action-subquery_extend_over_extend_for-default.txt-Analyze]": [
{
"checksum": "b4dd508a329723c74293d80f0278c705",
Expand Down
14 changes: 14 additions & 0 deletions ydb/library/yql/tests/sql/hybrid_file/part3/canondata/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,20 @@
"uri": "https://{canondata_backend}/1936842/11d23d4a39031af80d6dc470ce99f9427771e7d4/resource.tar.gz#test.test_action-runtime_apply_quoted_code-default.txt-Plan_/plan.txt"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Debug]": [
{
"checksum": "aaf31bf3320eee515f521de5bd072733",
"size": 319,
"uri": "https://{canondata_backend}/1937492/3b472eddc14507ca61231b1a308e847ec2b7b2bf/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Debug_/opt.yql_patched"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Plan]": [
{
"checksum": "b4dd508a329723c74293d80f0278c705",
"size": 505,
"uri": "https://{canondata_backend}/1937492/3b472eddc14507ca61231b1a308e847ec2b7b2bf/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Plan_/plan.txt"
}
],
"test.test[action-runtime_if_select-default.txt-Debug]": [
{
"checksum": "1db74c200d67fcd712c5819002d0d75c",
Expand Down
14 changes: 14 additions & 0 deletions ydb/library/yql/tests/sql/sql2yql/canondata/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,13 @@
"uri": "https://{canondata_backend}/1924537/1ab444909086b08bd4fe21c5a43f5e183c647e0a/resource.tar.gz#test_sql2yql.test_action-runtime_for_select_/sql.yql"
}
],
"test_sql2yql.test[action-runtime_format_free_args_code]": [
{
"checksum": "02b5ea14dde685153e4722c2bb6e7a4c",
"size": 1196,
"uri": "https://{canondata_backend}/1923547/78fed4f7afc37de597283a2c719a0b187e07580a/resource.tar.gz#test_sql2yql.test_action-runtime_format_free_args_code_/sql.yql"
}
],
"test_sql2yql.test[action-runtime_format_type]": [
{
"checksum": "dc7d0e2038f949d2c2b807efcb1b6bc7",
Expand Down Expand Up @@ -18206,6 +18213,13 @@
"uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_action-runtime_for_select_/formatted.sql"
}
],
"test_sql_format.test[action-runtime_format_free_args_code]": [
{
"checksum": "4438a41bdf0a312042ae3ec7a640667d",
"size": 200,
"uri": "https://{canondata_backend}/1923547/78fed4f7afc37de597283a2c719a0b187e07580a/resource.tar.gz#test_sql_format.test_action-runtime_format_free_args_code_/formatted.sql"
}
],
"test_sql_format.test[action-runtime_format_type]": [
{
"checksum": "e3a6d1a6e7990a204718be9ab2207461",
Expand Down
6 changes: 6 additions & 0 deletions ydb/library/yql/tests/sql/suites/action/runtime_format_free_args_code.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$x = EvaluateCode(LambdaCode(($arg1, $arg2)->{
$f = FuncCode("Concat", $arg1, $arg2);
return ReprCode(FormatCode($f));
}));

select $x(1,2);
21 changes: 21 additions & 0 deletions ydb/library/yql/tests/sql/yt_native_file/part7/canondata/result.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,27 @@
"uri": "https://{canondata_backend}/1946324/6707647cfa387ec829af2d598f1608a04da08a21/resource.tar.gz#test.test_action-eval_taggedtype-default.txt-Results_/results.txt"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Debug]": [
{
"checksum": "7075c9421e8a9fad397ebe965466dd41",
"size": 252,
"uri": "https://{canondata_backend}/1600758/e12cb55ca989943258bb8934f115b80cef986bec/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Debug_/opt.yql"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Plan]": [
{
"checksum": "b4dd508a329723c74293d80f0278c705",
"size": 505,
"uri": "https://{canondata_backend}/1600758/e12cb55ca989943258bb8934f115b80cef986bec/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Plan_/plan.txt"
}
],
"test.test[action-runtime_format_free_args_code-default.txt-Results]": [
{
"checksum": "93c5c5aab4f6152cdcf62546063ecc2d",
"size": 710,
"uri": "https://{canondata_backend}/1600758/e12cb55ca989943258bb8934f115b80cef986bec/resource.tar.gz#test.test_action-runtime_format_free_args_code-default.txt-Results_/results.txt"
}
],
"test.test[action-subquery_extend_over_extend_for-default.txt-Debug]": [
{
"checksum": "e47bbbc87b1ecf11227af2832ce752e2",
Expand Down