diff options
| author | zhvv117 <[email protected]> | 2024-12-10 15:03:37 +0300 |
|---|---|---|
| committer | zhvv117 <[email protected]> | 2024-12-10 15:59:08 +0300 |
| commit | 7f972801c725421d055c96fd78343874db860bbd (patch) | |
| tree | 5d53bd8ebd3d13c80c188c2e8a1cac150eeda945 | |
| parent | 73e8da4c3b3716355b13a2f70c9b3e6fc6513991 (diff) | |
remove redundant semicolons, always add semicolon after last statement in lambdas and actions
commit_hash:d2b19f44d3c6f6e89f03c2c27e897d2b55e6174e
136 files changed, 457 insertions, 386 deletions
diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp index 6a2c0e13bf5..c5052c44c88 100644 --- a/yql/essentials/sql/v1/format/sql_format.cpp +++ b/yql/essentials/sql/v1/format/sql_format.cpp @@ -43,6 +43,39 @@ TTokenIterator SkipWSOrComment(TTokenIterator curr, TTokenIterator end) { return curr; } +TTokenIterator SkipWSOrCommentBackward(TTokenIterator curr, TTokenIterator begin) { + while (curr != begin && (curr->Name == "WS" || curr->Name == "COMMENT")) { + --curr; + } + return curr; +} + +void SkipForValidate( + TTokenIterator& in, + TTokenIterator& out, + const TParsedTokenList& query, + const TParsedTokenList& formattedQuery +) { + in = SkipWS(in, query.end()); + out = SkipWS(out, formattedQuery.end()); + + while ( + in != query.end() && in->Name == "SEMICOLON" && + (out == formattedQuery.end() || out->Name != "SEMICOLON") && + in != query.begin() && IsIn({"SEMICOLON", "LBRACE_CURLY", "AS"}, SkipWSOrCommentBackward(in - 1, query.begin())->Name) + ) { + in = SkipWS(++in, query.end()); + } + + auto inSkippedComments = SkipWSOrComment(in, query.end()); + if ( + out != formattedQuery.end() && out->Name == "SEMICOLON" && + inSkippedComments != query.end() && IsIn({"RBRACE_CURLY", "END"}, inSkippedComments->Name) + ) { + out = SkipWS(++out, formattedQuery.end()); + } +} + TParsedToken TransformTokenForValidate(TParsedToken token) { if (token.Name == "EQUALS2") { token.Name = "EQUALS"; @@ -61,8 +94,7 @@ bool Validate(const TParsedTokenList& query, const TParsedTokenList& formattedQu auto outEnd = formattedQuery.end(); while (in != inEnd && out != outEnd) { - in = SkipWS(in, inEnd); - out = SkipWS(out, outEnd); + SkipForValidate(in, out, query, formattedQuery); if (in != inEnd && out != outEnd) { auto inToken = TransformTokenForValidate(*in); auto outToken = TransformTokenForValidate(*out); @@ -82,8 +114,7 @@ bool Validate(const TParsedTokenList& query, const TParsedTokenList& formattedQu ++out; } } - in = SkipWS(in, inEnd); - out = SkipWS(out, outEnd); + SkipForValidate(in, out, query, formattedQuery); return in == inEnd && out == outEnd; } @@ -777,20 +808,34 @@ private: } } + template <typename T> + void SkipSemicolons(const ::google::protobuf::RepeatedPtrField<T>& field, bool printOne = false) { + for (const auto& m : field) { + if (printOne) { + Visit(m); + printOne = false; + } else { + ++TokenIndex; + } + } + if (printOne) { + Out(';'); + } + } + void VisitDefineActionOrSubqueryBody(const TRule_define_action_or_subquery_body& msg) { - VisitRepeated(msg.GetBlock1()); + SkipSemicolons(msg.GetBlock1()); if (msg.HasBlock2()) { const auto& b = msg.GetBlock2(); Visit(b.GetRule_sql_stmt_core1()); for (auto block : b.GetBlock2()) { - VisitRepeated(block.GetBlock1()); + SkipSemicolons(block.GetBlock1(), /* printOne = */ true); if (!IsSimpleStatement(block.GetRule_sql_stmt_core2()).GetOrElse(false)) { Out('\n'); } Visit(block.GetRule_sql_stmt_core2()); } - - VisitRepeated(b.GetBlock3()); + SkipSemicolons(b.GetBlock3(), /* printOne = */ true); } } @@ -2344,9 +2389,10 @@ private: void VisitLambdaBody(const TRule_lambda_body& msg) { PushCurrentIndent(); NewLine(); - VisitRepeated(msg.GetBlock1()); + SkipSemicolons(msg.GetBlock1()); for (const auto& block : msg.GetBlock2()) { - Visit(block); + Visit(block.GetRule_lambda_stmt1()); + SkipSemicolons(block.GetBlock2(), /* printOne = */ true); NewLine(); } @@ -2354,8 +2400,8 @@ private: ExprLineIndent = CurrentIndent; Visit(msg.GetRule_expr4()); - VisitRepeated(msg.GetBlock5()); + SkipSemicolons(msg.GetBlock5(), /* printOne = */ true); ExprLineIndent = 0; PopCurrentIndent(); @@ -3068,7 +3114,7 @@ public: return false; } - if (!Validate(stmtFormattedTokens, stmtTokens)) { + if (!Validate(stmtTokens, stmtFormattedTokens)) { issues.AddIssue(NYql::TIssue({}, TStringBuilder() << "Validation failed: " << currentQuery.Quote() << " != " << currentFormattedQuery.Quote())); return false; } diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h index 27a06119ccf..1503bb0414f 100644 --- a/yql/essentials/sql/v1/format/sql_format_ut.h +++ b/yql/essentials/sql/v1/format/sql_format_ut.h @@ -557,6 +557,25 @@ Y_UNIT_TEST(DefineActionOrSubquery) { "VALUES\n\t\t\t(1)\n\t\t;\n\tEND DEFINE;\n\n\t" "DEFINE SUBQUERY $c() AS\n\t\tSELECT\n\t\t\t1\n\t\t;\n\t" "END DEFINE;\n\tDO\n\t\t$b()\n\t;\n\n\tPROCESS $c();\nEND DEFINE;\n"}, + {"define action $foo($bar) as;" + "$a = 10;; " + "$b = 20;;; " + "$c = $a + $b " + "end define", + "DEFINE ACTION $foo($bar) AS\n\t" + "$a = 10;\n\t" + "$b = 20;\n\t" + "$c = $a + $b;\n" + "END DEFINE;\n"}, + {"define subquery $s() as;" + "select * from $t1 " + "union all select * from $t2 " + "end define", + "DEFINE SUBQUERY $s() AS\n\t" + "SELECT\n\t\t*\n\tFROM\n\t\t$t1\n\t" + "UNION ALL\n\t" + "SELECT\n\t\t*\n\tFROM\n\t\t$t2\n\t;\n" + "END DEFINE;\n"}, }; TSetup setup; @@ -872,9 +891,11 @@ Y_UNIT_TEST(CompositeTypesAndQuestions) { Y_UNIT_TEST(Lambda) { TCases cases = { {"$f=($a,$b)->{$x=$a+$b;return $a*$x};$g=($a,$b?)->($a+$b??0);select $f(10,4),$g(1,2);", - "$f = ($a, $b) -> {\n\t$x = $a + $b;\n\tRETURN $a * $x\n};\n\n" + "$f = ($a, $b) -> {\n\t$x = $a + $b;\n\tRETURN $a * $x;\n};\n\n" "$g = ($a, $b?) -> ($a + $b ?? 0);\n\n" "SELECT\n\t$f(10, 4),\n\t$g(1, 2)\n;\n"}, + {"$f=($arg)->{;$a=10;;$b=20;;;RETURN $a+$b}", + "$f = ($arg) -> {\n\t$a = 10;\n\t$b = 20;\n\tRETURN $a + $b;\n};\n"}, }; TSetup setup; @@ -1444,7 +1465,7 @@ Y_UNIT_TEST(ExistsExpr) { Y_UNIT_TEST(LambdaInsideExpr) { TCases cases = { {"SELECT ListMap(AsList(1,2),($x)->{return $x+1});", - "SELECT\n\tListMap(\n\t\tAsList(1, 2), ($x) -> {\n\t\t\tRETURN $x + 1\n\t\t}\n\t)\n;\n"}, + "SELECT\n\tListMap(\n\t\tAsList(1, 2), ($x) -> {\n\t\t\tRETURN $x + 1;\n\t\t}\n\t)\n;\n"}, }; TSetup setup; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql index 5184ecd7ac3..0a0e4a9c661 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql @@ -8,7 +8,7 @@ $combineQueries = ($query, $list) -> { ($world) -> { $queries = ListMap( $list, ($arg) -> { - RETURN FuncCode("Apply", QuoteCode($query), $world, ReprCode($arg)) + RETURN FuncCode("Apply", QuoteCode($query), $world, ReprCode($arg)); } ); RETURN FuncCode("UnionAll", $queries); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql index 47cc04d6df3..e2fbb4d493d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql @@ -8,7 +8,7 @@ $combineQueries = ($query, $list) -> { ($world) -> { $queries = ListMap( $list, ($arg) -> { - RETURN FuncCode("Apply", QuoteCode($query), $world, ReprCode($arg)) + RETURN FuncCode("Apply", QuoteCode($query), $world, ReprCode($arg)); } ); RETURN FuncCode("Extend", $queries); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql index 9680ea63d80..1ab3cec98c3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql @@ -7,7 +7,7 @@ SELECT $inc = EvaluateCode( LambdaCode( ($x) -> { - RETURN FuncCode("+", $x, FuncCode("Int32", AtomCode("1"))) + RETURN FuncCode("+", $x, FuncCode("Int32", AtomCode("1"))); } ) ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql index 3eb0caa935b..b952dc40a56 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql @@ -5,7 +5,7 @@ USE plato; $arg1 = "" || ""; $arg2 = ($_item) -> { - RETURN TRUE + RETURN TRUE; }; $arg3 = "" || ""; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql index 9c7a2c8a58d..25e5443d2f8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql @@ -28,7 +28,7 @@ EVALUATE FOR $i IN ListMap(ListFromRange(0, 0), $f) DO EVALUATE FOR $i IN Yql::Map( 1 / 1, ($x) -> { - RETURN AsList($x) + RETURN AsList($x); } ) DO $action1($i) @@ -36,7 +36,7 @@ EVALUATE FOR $i IN Yql::Map( EVALUATE FOR $i IN Yql::Map( 1 / 0, ($x) -> { - RETURN AsList($x) + RETURN AsList($x); } ) DO $action1($i) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql index 27b0303a024..9fb2e124bc6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql @@ -21,7 +21,7 @@ $myAddSuffix = ($row, $value) -> { FuncCode("Member", $r, AtomCode($i.Name)), ReprCode($value) ) - ) + ); } ) ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql index 92ba8628123..c0fc6d174e7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql @@ -4,7 +4,7 @@ USE plato; $keep_only_last = ($row) -> { $members = ListFilter(StructMembers($row), ($x) -> (FIND($x, "key") IS NOT NULL)); - RETURN ChooseMembers($row, $members) + RETURN ChooseMembers($row, $members); }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql index cb404b3ab1d..fd853e1e31d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql @@ -9,7 +9,7 @@ $force_remove_members = ($struct, $to_remove) -> { ($st) -> { $to_keep = ListFlatMap( StructTypeComponents(TypeHandle(TypeOf($struct))), ($x) -> { - RETURN IF($x.Name NOT IN $to_remove, $x.Name) + RETURN IF($x.Name NOT IN $to_remove, $x.Name); } ); RETURN FuncCode( @@ -17,14 +17,14 @@ $force_remove_members = ($struct, $to_remove) -> { ListMap( $to_keep, ($x) -> { - RETURN ListCode(AtomCode($x), FuncCode("Member", $st, AtomCode($x))) + RETURN ListCode(AtomCode($x), FuncCode("Member", $st, AtomCode($x))); } ) - ) + ); } ) ); - RETURN $remover($struct) + RETURN $remover($struct); }; DEFINE ACTION $func($input, $output) AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql index edb08267efd..3edfc66d6e9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql @@ -12,22 +12,22 @@ SELECT ), LambdaCode( () -> { - RETURN AtomCode("7") + RETURN AtomCode("7"); } ), LambdaCode( ($x) -> { - RETURN FuncCode("-", $x) + RETURN FuncCode("-", $x); } ), LambdaCode( ($x, $y) -> { - RETURN FuncCode("*", $x, $y) + RETURN FuncCode("*", $x, $y); } ), LambdaCode( 2, ($args) -> { - RETURN FuncCode("+", Unwrap($args[0]), Unwrap($args[1])) + RETURN FuncCode("+", Unwrap($args[0]), Unwrap($args[1])); } ), ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql index 4cbd0c82ae9..57a358bfb71 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql @@ -8,7 +8,7 @@ SELECT FormatCode( QuoteCode( ($x, $y) -> { - RETURN $x + $y + RETURN $x + $y; } ) ), @@ -17,10 +17,10 @@ SELECT RETURN FormatCode( QuoteCode( ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ) - ) + ); } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql index 064fd2ed535..ea3207c7363 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql @@ -5,7 +5,7 @@ $fact = EvaluateCode( ListFromRange(1, 11), ReprCode(1), ($item, $state) -> { - RETURN FuncCode("*", $state, ReprCode($item)) + RETURN FuncCode("*", $state, ReprCode($item)); } ) ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql index 97d25cedeb5..272b5bac582 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql @@ -1,11 +1,11 @@ /* syntax version 1 */ /* postgres can not */ $formatTagged = ($x) -> { - RETURN AsStruct(FormatType($x.Base) AS Base, $x.Tag AS Tag) + RETURN AsStruct(FormatType($x.Base) AS Base, $x.Tag AS Tag); }; $formatArgument = ($x) -> { - RETURN AsStruct(FormatType($x.Type) AS Type, $x.Name AS Name, $x.Flags AS Flags) + RETURN AsStruct(FormatType($x.Type) AS Type, $x.Name AS Name, $x.Flags AS Flags); }; $formatCallable = ($x) -> { @@ -14,7 +14,7 @@ $formatCallable = ($x) -> { $x.Payload AS Payload, FormatType($x.Result) AS Result, ListMap($x.Arguments, $formatArgument) AS Arguments - ) + ); }; SELECT @@ -31,14 +31,14 @@ SELECT ListMap( TupleTypeComponents(ParseTypeHandle("Tuple<Int32,String>")), ($x) -> { - RETURN FormatType($x) + RETURN FormatType($x); } ), FormatType( TupleTypeHandle( ListMap( AsList("Int32", "String"), ($x) -> { - RETURN ParseTypeHandle($x) + RETURN ParseTypeHandle($x); } ) ) @@ -46,7 +46,7 @@ SELECT ListMap( StructTypeComponents(ParseTypeHandle("Struct<foo:Int32,bar:String>")), ($x) -> { - RETURN AsTuple($x.Name, FormatType($x.Type)) + RETURN AsTuple($x.Name, FormatType($x.Type)); } ), FormatType( @@ -54,7 +54,7 @@ SELECT ListMap( AsList(AsTuple("foo", "Int32"), AsTuple("bar", "String")), ($x) -> { - RETURN AsStruct($x.0 AS Name, ParseTypeHandle($x.1) AS Type) + RETURN AsStruct($x.0 AS Name, ParseTypeHandle($x.1) AS Type); } ) ) @@ -62,7 +62,7 @@ SELECT StaticMap( DictTypeComponents(ParseTypeHandle("Dict<String,Int32>")), ($x) -> { - RETURN FormatType($x) + RETURN FormatType($x); } ), FormatType(DictTypeHandle(ParseTypeHandle("String"), ParseTypeHandle("Int32"))), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql index 51f39a7bed2..9944a5d205b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql @@ -7,6 +7,7 @@ DEFINE SUBQUERY $get_tables_list($dir) AS Unwrap($dir || "/" || CAST(TableName(Path, "yt") AS String)) AS Path, FROM FOLDER($dir) + ; END DEFINE; DEFINE SUBQUERY $get_all_tables_list($dirs) AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql index 5c1f7b2fca3..b56291a1896 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql index 500eb0dddbb..189dab2116e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.a, $z.a < 2) + RETURN AsTuple($z.a, $z.a < 2); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql index 55fccdc8dd6..86fc3148a83 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql index 3e986039196..4ee29cf0568 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql index ef65ca7b793..7e54371f500 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql index 3974f6bbbf6..066e5a949b4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql index e6f112abdc9..9985ccd8619 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql index c891a554d02..73292c42e6a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql @@ -20,7 +20,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql index 15fe84a8d2d..419ff1be0f5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql @@ -17,7 +17,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.value, $z.key) + RETURN AsTuple($z.value, $z.key); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql index 508819acf2b..c0692c417b8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.a, -$z.a) + RETURN AsTuple($z.a, -$z.a); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql index c00440038a1..27d76004b96 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql index 4ff1865cb59..e28bdaf77be 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql index 746e03ccb57..f006127488e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql @@ -38,27 +38,27 @@ $my_table = -- Эмуляция агрегационной функции COUNT $cnt_create = ($_item, $_parent) -> { - RETURN 1ul + RETURN 1ul; }; $cnt_add = ($state, $_item, $_parent) -> { - RETURN 1ul + $state + RETURN 1ul + $state; }; $cnt_merge = ($state1, $state2) -> { - RETURN $state1 + $state2 + RETURN $state1 + $state2; }; $cnt_get_result = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_serialize = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_deserialize = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_default = 0l; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql index 0b2528d0e02..a18f61bd1c4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql @@ -38,27 +38,27 @@ $my_table = -- Эмуляция агрегационной функции COUNT $cnt_create = ($_item, $_parent) -> { - RETURN 1ul + RETURN 1ul; }; $cnt_add = ($state, $_item, $_parent) -> { - RETURN 1ul + $state + RETURN 1ul + $state; }; $cnt_merge = ($state1, $state2) -> { - RETURN $state1 + $state2 + RETURN $state1 + $state2; }; $cnt_get_result = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_serialize = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_deserialize = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_default = 0ul; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql index c11a320aca1..50356887af0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql index d79dd122b91..1ece4388fe0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.a, 1.0) + RETURN AsTuple($z.a, 1.0); } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.a, 1.0) + RETURN AsTuple($z.a, 1.0); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql index 44a808f043e..319aaa3885f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql index fb4c9692bf0..dd40eba206f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql index 0972fe87803..7271db98e7e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql index 73aef839cdc..8557126f1b2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql index 5156bcebcb4..118f63c5e3f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql index ca55590064f..4cfa7115e54 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql index 5117325f225..a6025485aa2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql @@ -14,7 +14,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.value, $z.key) + RETURN AsTuple($z.value, $z.key); } ) ) @@ -31,7 +31,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.value, $z.key) + RETURN AsTuple($z.value, $z.key); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql index c3b36305bf7..78fbfda7a68 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql index a99d3a74bd5..1e1b7e0947a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql index b5496ac3771..d7cd2e133c3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql @@ -14,7 +14,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.value, $z.key) + RETURN AsTuple($z.value, $z.key); } ) ) @@ -31,7 +31,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.value, $z.key) + RETURN AsTuple($z.value, $z.key); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql index 39a05eca8a0..01cbf3a44b8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -25,7 +25,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -53,7 +53,7 @@ FROM SELECT ListSort( AGGREGATE_BY(DISTINCT a, $f), ($x) -> { - RETURN $x.Value + RETURN $x.Value; } ) FROM diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql index cd370c964c0..5ebb60c719a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql index cef7b28ba64..30a1ec06abe 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql index be7afbe4df6..172e50671a6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.a, $z.a > 1) + RETURN AsTuple($z.a, $z.a > 1); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql index d53af37f160..73886fb7c2f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql @@ -20,7 +20,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql index 2fe4606f3a6..9b152828601 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql @@ -17,7 +17,7 @@ SELECT AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN AsTuple($z.value, $z.key) + RETURN AsTuple($z.value, $z.key); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql index bc64c4914ed..f58c7ca2e68 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql @@ -2,27 +2,27 @@ /* postgres can not */ -- count example $create = ($_item, $_parent) -> { - RETURN 1 + RETURN 1; }; $add = ($state, $_item, $_parent) -> { - RETURN 1 + $state + RETURN 1 + $state; }; $merge = ($state1, $state2) -> { - RETURN $state1 + $state2 + RETURN $state1 + $state2; }; $get_result = ($state) -> { - RETURN $state + RETURN $state; }; $serialize = ($state) -> { - RETURN $state + RETURN $state; }; $deserialize = ($state) -> { - RETURN $state + RETURN $state; }; $default = 0; @@ -35,7 +35,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) @@ -51,7 +51,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql index bbfc74ca881..8783585b5e5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql @@ -2,27 +2,27 @@ /* postgres can not */ -- count example $create = ($_item, $_parent) -> { - RETURN 1 + RETURN 1; }; $add = ($state, $_item, $_parent) -> { - RETURN 1 + $state + RETURN 1 + $state; }; $merge = ($state1, $state2) -> { - RETURN $state1 + $state2 + RETURN $state1 + $state2; }; $get_result = ($state) -> { - RETURN $state + RETURN $state; }; $serialize = ($state) -> { - RETURN $state + RETURN $state; }; $deserialize = ($state) -> { - RETURN $state + RETURN $state; }; $default = 0; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql index f648394aead..50a3b894a9f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql @@ -2,30 +2,30 @@ $merge_dicts = ($dict1, $dict2) -> { RETURN SetUnion( $dict1, $dict2, ($_key, $a, $b) -> { - RETURN Coalesce($a, 0) + Coalesce($b, 0) + RETURN Coalesce($a, 0) + Coalesce($b, 0); } - ) + ); }; $create_single_item_dict = ($item, $_parent) -> { - RETURN AsDict(AsTuple($item, 1)) + RETURN AsDict(AsTuple($item, 1)); }; $count_values = AGGREGATION_FACTORY( "UDAF", $create_single_item_dict, ($dict, $item, $parent) -> { - RETURN $merge_dicts($create_single_item_dict($item, $parent), $dict) + RETURN $merge_dicts($create_single_item_dict($item, $parent), $dict); }, $merge_dicts ); $create_dict_from_list = ($list, $_parent) -> { - RETURN ListAggregate($list, $count_values) + RETURN ListAggregate($list, $count_values); }; $add_list_to_dict = ($dict, $list, $parent) -> { - RETURN $merge_dicts($create_dict_from_list($list, $parent), $dict) + RETURN $merge_dicts($create_dict_from_list($list, $parent), $dict); }; $count_list_values = AGGREGATION_FACTORY( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql index d910dd7cb36..bcb7a12154e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql @@ -9,7 +9,7 @@ SELECT AsTuple( AsAtom("res"), $f( ListItemType(TypeOf($t)), ($z) -> { - RETURN $z.a + RETURN $z.a; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql index 732dd213b37..196482e7409 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql @@ -8,7 +8,7 @@ SELECT ListSort( ListMap( aggregate_list(DISTINCT value), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) AS lst diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql index cbb8d62c9ee..3ebad78c99b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql @@ -5,7 +5,7 @@ $round_period = ($day, $period) -> { WHEN $period == 'w' THEN DateTime::MakeDate(DateTime::StartOfWeek($day)) WHEN $period == 'm' THEN DateTime::MakeDate(DateTime::StartOfMonth($day)) ELSE $day - END + END; }; $data = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql index 66a9ac8e6fa..c0289c896a8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql @@ -2,7 +2,7 @@ USE plato; $identity = ($x) -> { - RETURN $x + RETURN $x; }; $idDate32 = CALLABLE (Callable<(date32) -> date32>, $identity); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql index 362491866d7..1f93fb41097 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql @@ -22,6 +22,7 @@ DEFINE SUBQUERY $sub2($sub, $extra) AS $foo AS another FROM $sub() AS a + ; END DEFINE; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql index ff56e3dcd89..e728735d4cd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql @@ -1,7 +1,7 @@ /* syntax version 1 */ /* postgres can not */ $foo = ($item) -> { - RETURN $item + $item + RETURN $item + $item; }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql index ae62613c916..be9e55a79c6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql @@ -8,23 +8,23 @@ SELECT RETURN $c + $d + Yql::Fold( ListMap( AsList(5, 6), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) + Yql::Fold( ListMap( AsList(7, 8), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql index d4007068162..b0b70b736fd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql @@ -6,10 +6,10 @@ SELECT + Yql::Fold( ListMap( AsList(7, 8), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } ) + Yql::Fold( @@ -17,14 +17,14 @@ SELECT RETURN $c + $d + Yql::Fold( ListMap( AsList(5, 6), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_l2_/formatted.sql index e43bc7bea4b..d215a2ab100 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_l2_/formatted.sql @@ -3,9 +3,9 @@ SELECT AsList(1, 2), ($x) -> { RETURN ListMap( AsList(100, 101), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } - ) + ); } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-complete_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-complete_l2_/formatted.sql index a4e3d19daa1..8b0beb26118 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-complete_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-complete_l2_/formatted.sql @@ -4,9 +4,9 @@ SELECT AsList(1, 2), ($x) -> { RETURN $x + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql index 6db61c87f52..cad7187136a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql @@ -2,12 +2,12 @@ SELECT AsTuple( ListMap( AsList(1, 2), ($_x) -> { - RETURN 3 + 4 + RETURN 3 + 4; } ), ListMap( AsList("foo", "bar"), ($_x) -> { - RETURN 3 + 4 + RETURN 3 + 4; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_same_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_same_lambda_/formatted.sql index 65b11783694..a87840af38a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_same_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_same_lambda_/formatted.sql @@ -2,12 +2,12 @@ SELECT AsTuple( ListMap( AsList(1, 2), ($_x) -> { - RETURN 3 + 4 + RETURN 3 + 4; } ), ListMap( AsList(5, 6), ($_x) -> { - RETURN 3 + 4 + RETURN 3 + 4; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l0_and_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l0_and_l1_/formatted.sql index 1320a4e2e43..e399cb67e38 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l0_and_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l0_and_l1_/formatted.sql @@ -3,7 +3,7 @@ SELECT AsList(1 + 2), ListMap( AsList(1, 2), ($x) -> { - RETURN $x + (1 + 2) + RETURN $x + (1 + 2); } ), ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_/formatted.sql index f2f3249c19e..225719fca48 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_/formatted.sql @@ -2,7 +2,7 @@ SELECT AsList( ListMap( AsList(1, 2), ($x) -> { - RETURN ($x + 1) * ($x + 1) + RETURN ($x + 1) * ($x + 1); } ), ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_and_l0_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_and_l0_/formatted.sql index fca8f998fae..62e482f27d0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_and_l0_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-expr_in_l1_and_l0_/formatted.sql @@ -2,7 +2,7 @@ SELECT AsList( ListMap( AsList(1, 2), ($x) -> { - RETURN $x + (1 + 2) + RETURN $x + (1 + 2); } ), AsList(1 + 2) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_/formatted.sql index 5f874287918..df19c2b663a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_/formatted.sql @@ -4,18 +4,18 @@ SELECT AsList(1, 2), ($x) -> { RETURN ($x + 1) * ($x + 1) + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ), ListMap( AsList(10, 11), ($x) -> { RETURN ($x + 1) * ($x + 1) + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_many_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_many_/formatted.sql index 1a6b17fb2d6..ee2222f1efb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_many_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-l2_dup_l1_many_/formatted.sql @@ -4,26 +4,26 @@ SELECT AsList(1, 2), ($_x) -> { RETURN Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } ) + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ), ListMap( AsList(10, 11), ($_x) -> { RETURN Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } ) * Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l0_and_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l0_and_l1_/formatted.sql index f5e91fb3a6c..ff0d0cb6d58 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l0_and_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l0_and_l1_/formatted.sql @@ -2,7 +2,7 @@ SELECT AsList( ListMap( AsList(1, 2), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ), ListMap( @@ -10,12 +10,12 @@ SELECT RETURN $x + Yql::Fold( ListMap( AsList(5, 6), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l1_and_l0_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l1_and_l0_/formatted.sql index 6a9f8866cd1..66272dcf0bd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l1_and_l0_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-lambda_in_l1_and_l0_/formatted.sql @@ -5,17 +5,17 @@ SELECT RETURN $x + Yql::Fold( ListMap( AsList(5, 6), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ), ListMap( AsList(1, 2), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql index 5075b692612..b745aa2c694 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql @@ -10,18 +10,18 @@ SELECT AsList(5, 6), ($y) -> { RETURN $x + Yql::Fold( AsList(11, 12), 2, ($e, $f) -> { - RETURN $e + $f + $y + RETURN $e + $f + $y; } - ) + ); } ), 0, ($a, $b) -> { RETURN $a + $b + Yql::Fold( AsList(13, 14), 3, ($i, $j) -> { - RETURN $i + $j + $a + RETURN $i + $j + $a; } - ) + ); } - ) + ); } ) + Yql::Fold( @@ -29,18 +29,18 @@ SELECT AsList(7, 8), ($y) -> { RETURN $x + Yql::Fold( AsList(11, 12), 2, ($e, $f) -> { - RETURN $e + $f + $y + RETURN $e + $f + $y; } - ) + ); } ), 0, ($a, $b) -> { RETURN $a + $b + Yql::Fold( AsList(13, 14), 3, ($i, $j) -> { - RETURN $i + $j + $a + RETURN $i + $j + $a; } - ) + ); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_unordered_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_unordered_/formatted.sql index f8323dbec01..d082344ba9c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_unordered_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_unordered_/formatted.sql @@ -13,22 +13,22 @@ SELECT RETURN MIN_OF( $x, Yql::Fold( AsList(11, 12), 10, ($e, $f) -> { - RETURN MIN_OF($f, $y, $e) + RETURN MIN_OF($f, $y, $e); } ) - ) + ); } ), 100, ($a, $b) -> { RETURN MIN_OF( $a, $b, Yql::Fold( AsList(13, 14), 100, ($i, $j) -> { - RETURN MIN_OF($i, $j, $a) + RETURN MIN_OF($i, $j, $a); } ) - ) + ); } ) - ) + ); } ), Yql::Fold( @@ -37,22 +37,22 @@ SELECT RETURN MIN_OF( $x, Yql::Fold( AsList(11, 12), 10, ($e, $f) -> { - RETURN MIN_OF($e, $f, $y) + RETURN MIN_OF($e, $f, $y); } ) - ) + ); } ), 100, ($a, $b) -> { RETURN MIN_OF( $b, Yql::Fold( AsList(13, 14), 100, ($i, $j) -> { - RETURN MIN_OF($a, $j, $i) + RETURN MIN_OF($a, $j, $i); } ), $a - ) + ); } ) - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql index de47cba7e62..25f59a8bd50 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql @@ -8,16 +8,16 @@ SELECT AsList(7, 8), ($y) -> { RETURN $x + Yql::Fold( AsList(11, 12), 2, ($e, $f) -> { - RETURN $e + $f + $y + RETURN $e + $f + $y; } - ) + ); } ), 0, ($a, $b) -> { RETURN $a + $b + Yql::Fold( AsList(13, 14), 3, ($i, $j) -> { - RETURN $i + $j + $a + RETURN $i + $j + $a; } - ) + ); } ) + Yql::Fold( @@ -27,20 +27,20 @@ SELECT AsList(5, 6), ($y) -> { RETURN $x + Yql::Fold( AsList(11, 12), 2, ($e, $f) -> { - RETURN $e + $f + $y + RETURN $e + $f + $y; } - ) + ); } ), 0, ($a, $b) -> { RETURN $a + $b + Yql::Fold( AsList(13, 14), 3, ($i, $j) -> { - RETURN $i + $j + $a + RETURN $i + $j + $a; } - ) + ); } - ) + ); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_unordered_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_unordered_/formatted.sql index c15c394959b..af3d9bb476b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_unordered_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_unordered_/formatted.sql @@ -10,19 +10,19 @@ SELECT RETURN MAX_OF( $x, Yql::Fold( AsList(11, 12), 2, ($e, $f) -> { - RETURN MAX_OF($e, $f, $y) + RETURN MAX_OF($e, $f, $y); } ) - ) + ); } ), 0, ($a, $b) -> { RETURN MAX_OF( $a, $b, Yql::Fold( AsList(13, 14), 3, ($i, $j) -> { - RETURN MAX_OF($i, $j, $a) + RETURN MAX_OF($i, $j, $a); } ) - ) + ); } ), Yql::Fold( @@ -34,25 +34,25 @@ SELECT RETURN MAX_OF( $x, Yql::Fold( AsList(11, 12), 2, ($e, $f) -> { - RETURN MAX_OF($f, $y, $e) + RETURN MAX_OF($f, $y, $e); } ) - ) + ); } ), 0, ($a, $b) -> { RETURN MAX_OF( Yql::Fold( AsList(13, 14), 3, ($i, $j) -> { - RETURN MAX_OF($j, $a, $i) + RETURN MAX_OF($j, $a, $i); } ), $a, $b - ) + ); } ) - ) + ); } ) - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_closure_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_closure_l2_/formatted.sql index b2b37db5170..6a7a834fc18 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_closure_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_closure_l2_/formatted.sql @@ -4,15 +4,15 @@ SELECT RETURN ListExtend( ListMap( AsList(100, 101), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ), ListMap( AsList(100, 101), ($y) -> { - RETURN $x + $y + RETURN $x + $y; } ) - ) + ); } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_/formatted.sql index 0f06ff40b7d..aa9ba6dd3c1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_/formatted.sql @@ -4,18 +4,18 @@ SELECT AsList(1, 2), ($x) -> { RETURN $x + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ), ListMap( AsList(10, 11), ($x) -> { RETURN $x + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_expr_/formatted.sql index 9675ccd97f3..3b771d44592 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_complete_l2_expr_/formatted.sql @@ -4,18 +4,18 @@ SELECT AsList(1, 2), ($x) -> { RETURN $x + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ), ListMap( AsList(1, 2), ($x) -> { RETURN $x + Yql::Fold( AsList(1), 0, ($a, $b) -> { - RETURN $a + $b + RETURN $a + $b; } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_/formatted.sql index 69f880784a1..7dbf2204a5f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_/formatted.sql @@ -4,18 +4,18 @@ SELECT 3 / 1, ($x) -> { RETURN YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ), YQL::FlatMap( 4 / 1, ($x) -> { RETURN YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_/formatted.sql index 2321d3f4202..6f7e4f7bde9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_/formatted.sql @@ -4,18 +4,18 @@ SELECT 3 / 1, ($x) -> { RETURN $x + YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ), YQL::FlatMap( 4 / 1, ($x) -> { RETURN $x + YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_expr_/formatted.sql index d8d3945f8df..4860b13f479 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_arg_both_level_expr_/formatted.sql @@ -4,18 +4,18 @@ SELECT 3 / 1, ($x) -> { RETURN $x + YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ), YQL::FlatMap( 3 / 1, ($x) -> { RETURN $x + YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_expr_/formatted.sql index 4d5e393c422..5a098312182 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_free_closure_size2_expr_/formatted.sql @@ -4,18 +4,18 @@ SELECT 3 / 1, ($x) -> { RETURN YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ), YQL::FlatMap( 3 / 1, ($x) -> { RETURN YQL::FlatMap( 1 / 1, ($y) -> { - RETURN Just($x + $y) + RETURN Just($x + $y); } - ) + ); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_/formatted.sql index a1dc88cc611..87ebf28fd28 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_/formatted.sql @@ -2,12 +2,12 @@ SELECT AsList( ListMap( AsList(1, 2), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ), ListMap( AsList(10, 11), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_expr_/formatted.sql index e4fd627ebe9..5eb3091beb6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-same_l1_expr_/formatted.sql @@ -2,12 +2,12 @@ SELECT AsList( ListMap( AsList(1, 2), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ), ListMap( AsList(1, 2), ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-all_timezones_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-all_timezones_/formatted.sql index 1167552afed..4024e910f97 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-all_timezones_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-all_timezones_/formatted.sql @@ -3,7 +3,7 @@ $zones = CAST( ListMap( ListFromRange(0us, 1000us), ($i) -> { - RETURN AsStruct($i AS id, SUBSTRING(CAST(YQL::AddTimezone(CurrentUtcDate(), $i) AS String), 11, NULL) AS zone) + RETURN AsStruct($i AS id, SUBSTRING(CAST(YQL::AddTimezone(CurrentUtcDate(), $i) AS String), 11, NULL) AS zone); } ) AS List<Struct<id: Uint16, zone: Utf8>> ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql index 629d88e654d..7ab4871a92f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql @@ -23,9 +23,9 @@ SELECT DictItems($d), ($x) -> { RETURN ListMap( DictItems($x.0), ($y) -> { - RETURN ($y, $x.1) + RETURN ($y, $x.1); } - ) + ); } ) ) @@ -34,7 +34,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql index c91940e2063..7c1c4b1d702 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql @@ -1,7 +1,7 @@ /* postgres can not */ /* syntax version 1 */ $lambda = ($x) -> { - RETURN CAST($x AS String) + RETURN CAST($x AS String); }; $callables = AsTuple( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql index ad97597e77c..e4f8aebb927 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql @@ -4,47 +4,47 @@ SELECT ListHasItems([]), Yql::Filter( [], ($x) -> { - RETURN $x + RETURN $x; } ), Yql::Map( [], ($x) -> { - RETURN $x * 2 + RETURN $x * 2; } ), Yql::FlatMap( [], ($x) -> { - RETURN Just($x * 2) + RETURN Just($x * 2); } ), Yql::OrderedFilter( [], ($x) -> { - RETURN $x + RETURN $x; } ), Yql::OrderedMap( [], ($x) -> { - RETURN $x * 2 + RETURN $x * 2; } ), Yql::OrderedFlatMap( [], ($x) -> { - RETURN Just($x * 2) + RETURN Just($x * 2); } ), ListFilter( [], ($x) -> { - RETURN $x + RETURN $x; } ), ListMap( [], ($x) -> { - RETURN $x * 2 + RETURN $x * 2; } ), ListFlatMap( [], ($x) -> { - RETURN Just($x * 2) + RETURN Just($x * 2); } ), ListCollect([]), @@ -67,17 +67,17 @@ SELECT ListHasItems(Just([])), ListFilter( Just([]), ($x) -> { - RETURN $x + RETURN $x; } ), ListMap( Just([]), ($x) -> { - RETURN $x * 2 + RETURN $x * 2; } ), ListFlatMap( Just([]), ($x) -> { - RETURN Just($x * 2) + RETURN Just($x * 2); } ), ListCollect(Just([])), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql index 8e81a621fac..e39bed21c50 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql @@ -1,7 +1,7 @@ /* syntax version 1 */ /* postgres can not */ $pred = ($x) -> { - RETURN $x > 0 + RETURN $x > 0; }; SELECT @@ -18,26 +18,26 @@ SELECT SetIncludes({1, 2, 3}, []), Yql::Fold( [], 0, ($x, $y) -> { - RETURN $x + $y + RETURN $x + $y; } ), Yql::Fold1( [], ($x) -> { - RETURN $x + RETURN $x; }, ($x, $y) -> { - RETURN $x + $y + RETURN $x + $y; } ), Yql::FoldMap( [], 0, ($x, $y) -> { - RETURN ($x + $y, $y) + RETURN ($x + $y, $y); } ), Yql::Fold1Map( [], ($x) -> { - RETURN ($x, $x) + RETURN ($x, $x); }, ($x, $y) -> { - RETURN ($x + $y, $y) + RETURN ($x + $y, $y); } ), Yql::LazyList([]), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql index f996e5ee8a8..fb7566ed3d6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql @@ -2,7 +2,7 @@ $lists = AsList(AsList("one", "two", "three"), AsList("head", NULL), AsList(NULL, "tail"), ListCreate(String?)); $map = ($l) -> { - RETURN AsTuple(ListHead($l), ListLast($l)) + RETURN AsTuple(ListHead($l), ListLast($l)); }; $structs = ListMap($lists, $map); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql index 9e6380b9f7d..b33ff4f196a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql @@ -2,7 +2,7 @@ $lists = AsList(AsList("one", "two", "three"), AsList("head", NULL), AsList(NULL, "tail"), ListCreate(String?)); $map = ($l) -> { - RETURN AsStruct(ListHead($l) AS head, ListLast($l) AS tail) + RETURN AsStruct(ListHead($l) AS head, ListLast($l) AS tail); }; $structs = ListMap($lists, $map); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql index d6060db4df4..0655144f496 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql @@ -6,9 +6,9 @@ SELECT $list, ($l) -> { RETURN ListMap( $lazy, ($r) -> { - RETURN AsTuple($l, $r) + RETURN AsTuple($l, $r); } - ) + ); } ) ; @@ -18,9 +18,9 @@ SELECT $lazy, ($l) -> { RETURN ListMap( $list, ($r) -> { - RETURN AsTuple($l, $r) + RETURN AsTuple($l, $r); } - ) + ); } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql index d47253299a9..bee57de5fdc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql @@ -25,7 +25,7 @@ SELECT $f = () -> { RETURN () -> { RETURN AsDict(AsTuple("foo", AsList(AsStruct(AsTuple(1) AS bar)))); - } + }; }; SELECT @@ -34,7 +34,7 @@ SELECT SELECT () -> { - RETURN 1 + RETURN 1; }() ; @@ -43,7 +43,7 @@ $type = Callable<() -> List<Int32>>; $g = AsStruct( Yql::Callable( $type, () -> { - RETURN AsList(1, 2, 3) + RETURN AsList(1, 2, 3); } ) AS foo ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql index bd2906c74d7..1b9c9903f09 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql @@ -5,36 +5,36 @@ $a = AsList(1, 2, 3, 1, 2, 3); SELECT ListTakeWhile( $a, ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ), ListSkipWhile( $a, ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ), Yql::Collect( YQL::TakeWhile( Yql::Iterator($a, Yql::DependsOn(1)), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ) ), Yql::Collect( YQL::SkipWhile( Yql::Iterator($a, Yql::DependsOn(2)), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ) ), Yql::TakeWhile( Just(1), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ), Yql::SkipWhile( Just(1), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql index 899bc471db1..767b72f9c68 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql @@ -5,36 +5,36 @@ $a = AsList(1, 2, 3, 1, 2, 3); SELECT ListTakeWhileInclusive( $a, ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ), ListSkipWhileInclusive( $a, ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ), Yql::Collect( YQL::TakeWhileInclusive( Yql::Iterator($a, Yql::DependsOn(1)), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ) ), Yql::Collect( YQL::SkipWhileInclusive( Yql::Iterator($a, Yql::DependsOn(2)), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ) ), Yql::TakeWhileInclusive( Just(1), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ), Yql::SkipWhileInclusive( Just(1), ($x) -> { - RETURN $x < 3 + RETURN $x < 3; } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql index 18fe0052cf6..9051de2e0ff 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql @@ -11,7 +11,7 @@ SELECT ; $p = ($x) -> { - RETURN $x < 3 + RETURN $x < 3; }; SELECT @@ -21,7 +21,7 @@ SELECT ; $m = ($x) -> { - RETURN $x * 2 + RETURN $x * 2; }; SELECT @@ -31,7 +31,7 @@ SELECT ; $f = ($x) -> { - RETURN AsList($x, $x * 2) + RETURN AsList($x, $x * 2); }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql index d9bf6a9e2cd..622ade4692d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql @@ -1,14 +1,14 @@ /* postgres can not */ $ns = ($set) -> { - RETURN ListSort(DictKeys($set)) + RETURN ListSort(DictKeys($set)); }; $nd = ($dict) -> { RETURN ListSort( DictItems($dict), ($z) -> { - RETURN $z.0 + RETURN $z.0; } - ) + ); }; SELECT @@ -41,7 +41,7 @@ SELECT AsDict(AsTuple(1, "foo"), AsTuple(3, "bar")), AsDict(AsTuple(1, "baz"), AsTuple(2, "qwe")), ($_k, $a, $b) -> { - RETURN AsTuple($a, $b) + RETURN AsTuple($a, $b); } ) ) @@ -81,7 +81,7 @@ SELECT AsDict(AsTuple(1, "foo"), AsTuple(3, "bar")), AsDict(AsTuple(1, "baz"), AsTuple(2, "qwe")), ($_k, $a, $b) -> { - RETURN AsTuple($a, $b) + RETURN AsTuple($a, $b); } ) ) @@ -97,7 +97,7 @@ SELECT AsDict(AsTuple(1, "foo"), AsTuple(3, "bar")), AsDict(AsTuple(1, "baz"), AsTuple(2, "qwe")), ($_k, $a, $b) -> { - RETURN AsTuple($a, $b) + RETURN AsTuple($a, $b); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql index a38bea2385e..7b21c952d95 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $i = AsDict(AsTuple(1, "A"), AsTuple(2, "B")); @@ -26,9 +26,9 @@ SELECT DictItems($d), ($x) -> { RETURN ListMap( DictItems($x.0), ($y) -> { - RETURN ($y, $x.1) + RETURN ($y, $x.1); } - ) + ); } ) ) @@ -37,7 +37,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) @@ -64,9 +64,9 @@ SELECT DictItems($d), ($x) -> { RETURN ListMap( DictItems($x.0), ($y) -> { - RETURN ($y, $x.1) + RETURN ($y, $x.1); } - ) + ); } ) ) @@ -75,7 +75,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) @@ -102,9 +102,9 @@ SELECT DictItems($d), ($x) -> { RETURN ListMap( DictItems($x.0), ($y) -> { - RETURN ($y, $x.1) + RETURN ($y, $x.1); } - ) + ); } ) ) @@ -113,7 +113,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) @@ -140,9 +140,9 @@ SELECT DictItems($d), ($x) -> { RETURN ListMap( DictItems($x.0), ($y) -> { - RETURN ($y, $x.1) + RETURN ($y, $x.1); } - ) + ); } ) ) @@ -151,7 +151,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql index beb8abd85d5..30e9744d6eb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $l = AsList( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql index ca76aed43ad..5313656fbd2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $l = AsList( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql index 3c9d1e291e1..a3c8b2c2af5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $vt = ParseType("Variant<a:Int32,b:Uint32>"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql index df7ee551ff3..a63d1716fd9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $vt = ParseType("Variant<Int32,Uint32>"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql index 85fed3ee533..a2bbe8b84d2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $i = AsDict(AsTuple(1, "A"), AsTuple(2, "B")); @@ -24,7 +24,7 @@ SELECT ListFlatten( ListMap( DictItems($d), ($x) -> { - RETURN DictItems($x.0) + RETURN DictItems($x.0); } ) ) @@ -33,7 +33,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) @@ -58,7 +58,7 @@ SELECT ListFlatten( ListMap( DictItems($d), ($x) -> { - RETURN DictItems($x.0) + RETURN DictItems($x.0); } ) ) @@ -67,7 +67,7 @@ SELECT ListFlatten( ListMap( DictKeys($d), ($x) -> { - RETURN DictItems($x) + RETURN DictItems($x); } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql index 6f975c890d9..7b2fab59566 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $l = AsList( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql index b3ede64b29f..1deb80e2f36 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $l = AsList( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql index ea764beaece..3c50b351c0a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $vt = ParseType("Variant<a:Int32,b:Uint32>"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql index 7601390d26c..19d22cc8e6f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $first = ($x) -> { - RETURN $x.0 + RETURN $x.0; }; $second = ($x) -> { - RETURN $x.1 + RETURN $x.1; }; $vt = ParseType("Variant<Int32,Uint32>"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql index bc5443de7f4..06bd2e60368 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql @@ -2,7 +2,7 @@ $id = ($x) -> { $f = Yql::Callable( CallableType(0, TypeOf($x)), () -> { - RETURN $x + RETURN $x; } ); RETURN $f(); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql index 9e7b15c71be..b286737c6d3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql @@ -2,7 +2,7 @@ $id = ($x) -> { $f = Yql::Callable( CallableType(0, TypeOf($x)), () -> { - RETURN $x + RETURN $x; } ); RETURN $f(); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql index b8fc8972624..382484a498a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql @@ -18,7 +18,7 @@ DEFINE SUBQUERY $last_tables($path, $limit) AS ORDER BY Name DESC LIMIT $limit - ) + ); END DEFINE; $logs = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql index f52292de33e..14dbdf5fa4b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql @@ -42,7 +42,7 @@ $age_suffixes = ($interval, $age_segments) -> { ListMap( $age_segments, ($i) -> { - RETURN <|age_suffix: ":Age:"u || $i.suffix, age_weight: $interval_fits_in($interval, $i)|> + RETURN <|age_suffix: ":Age:"u || $i.suffix, age_weight: $interval_fits_in($interval, $i)|>; } ), ($i) -> { diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql index fdd281fd424..26b025cc20a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql @@ -6,12 +6,12 @@ SELECT ListExtend( ListMap( $list, ($x) -> { - RETURN $x + 1 + RETURN $x + 1; } ), ListMap( $list, ($x) -> { - RETURN $x + 2 + RETURN $x + 2; } ) ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql index ff951c23a0f..27bf0e780c9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql @@ -11,20 +11,20 @@ $x2 = () -> (Tuple<Int32>); $y1 = () -> { $a = String; - RETURN $a + RETURN $a; }; $y2 = () -> { $a = Tuple<String>; - RETURN $a + RETURN $a; }; $z1 = () -> { - RETURN Double + RETURN Double; }; $z2 = () -> { - RETURN Tuple<Double> + RETURN Tuple<Double>; }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql index 966b76da32a..3a678770fc4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql @@ -37,7 +37,7 @@ $i3 = ( ); $udf = ($x) -> { - RETURN Yql::VariantItem($x) + RETURN Yql::VariantItem($x); }; PROCESS $i1, $i2, $i3 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql index 3de7c582273..ea62c0ec3ea 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql @@ -44,7 +44,7 @@ $i5 = ( ); $udf = ($x) -> { - RETURN Yql::VariantItem($x) + RETURN Yql::VariantItem($x); }; PROCESS $i1, $i2, $i3, $i4, $i5 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql index 3527c96f952..0bd427f80c5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql @@ -32,16 +32,16 @@ $udf = ($x) -> { Yql::Visit( $x, AsAtom("0"), ($i) -> { - RETURN Yql::Member($i, AsAtom("key")) + RETURN Yql::Member($i, AsAtom("key")); }, AsAtom("1"), ($i) -> { - RETURN Yql::Member($i, AsAtom("key")) + RETURN Yql::Member($i, AsAtom("key")); }, AsAtom("2"), ($i) -> { - RETURN Yql::Member($i, AsAtom("key")) + RETURN Yql::Member($i, AsAtom("key")); } ) AS key - ) + ); }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql index 344e5f9fd29..63370cba801 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql @@ -2,7 +2,7 @@ $list = AsList(AsStruct('one' AS x), AsStruct('two' AS x)); $lazy = ListMap( ListFromRange(1s, 3s), ($i) -> { - RETURN AsStruct($i AS y) + RETURN AsStruct($i AS y); } ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-strict_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-strict_keys_/formatted.sql index 38ab1cc5bea..00465402de2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-strict_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-strict_keys_/formatted.sql @@ -10,7 +10,7 @@ DEFINE SUBQUERY $strict() AS Input1 AS a JOIN Input2 AS b - USING (k1) + USING (k1); END DEFINE; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql index b47658f9b67..3ea33ab060c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql @@ -7,6 +7,7 @@ DEFINE SUBQUERY $sub($name) AS * FROM $name + ; END DEFINE; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql index b28eb8827c2..affad1a6501 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql @@ -1,10 +1,10 @@ /* postgres can not */ $modVal = () -> { - RETURN 2 + RETURN 2; }; $filter = ($item) -> { - RETURN NOT ($item % $modVal() == 0) + RETURN NOT ($item % $modVal() == 0); }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql index d80a3309082..a20778ac63d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql @@ -8,9 +8,9 @@ $shiftSteps = 1; $linear = ($x, $z) -> { $v = 10 * $z + $x; $shift = ($item) -> { - RETURN $item << $shiftSteps + RETURN $item << $shiftSteps; }; - RETURN $shift($v) + RETURN $shift($v); }; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql index efb7b146701..8fb91977838 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql @@ -7,10 +7,10 @@ $shiftSteps = 1; $linear = ($x, $z) -> { $v = 10 * $z + $x; $shift = ($item) -> { - RETURN $item << $shiftSteps + RETURN $item << $shiftSteps; }; $res = Math::Floor(Math::Pi() * $shift($v)); - RETURN $res + RETURN $res; }; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql index cd690d460e6..8c691e28305 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql @@ -4,15 +4,15 @@ USE plato; PRAGMA DisableSimpleColumns; $shiftSteps = ($item) -> { - RETURN CAST($item % 4 AS Uint8) ?? 0 + RETURN CAST($item % 4 AS Uint8) ?? 0; }; $linear = ($x, $z, $func) -> { $v = 10 * $z + $x; $shift = ($item, $sk) -> { - RETURN $item << $func($sk) + RETURN $item << $func($sk); }; - RETURN $shift($v, $z) + RETURN $shift($v, $z); }; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql index d803f0d5c6e..5a6cef03545 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql @@ -5,6 +5,7 @@ DEFINE SUBQUERY $f() AS * FROM Input + ; END DEFINE; INSERT INTO Output WITH truncate diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql index e2744dfc2d5..9b17c18e28a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql @@ -3,11 +3,11 @@ USE plato; $to_int = ($x) -> { - RETURN CAST($x AS Int32) + RETURN CAST($x AS Int32); }; $to_in_list = ($col) -> { - RETURN ListMap(String::SplitToList($col, ","), $to_int) + RETURN ListMap(String::SplitToList($col, ","), $to_int); }; $input = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-tuple01_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-tuple01_/formatted.sql index 825b70457c2..925b87327d6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-tuple01_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-tuple01_/formatted.sql @@ -4,7 +4,7 @@ SELECT AsList(3, 2, 1), AsTuple(), ($_x) -> { - RETURN AsTuple() + RETURN AsTuple(); } ) ; @@ -14,7 +14,7 @@ SELECT AsList(3, 2, 1), AsTuple(TRUE), ($x) -> { - RETURN $x + RETURN $x; } ) ; @@ -24,7 +24,7 @@ SELECT AsList(3, 2, 1), TRUE, ($x) -> { - RETURN $x + RETURN $x; } ) ; @@ -34,7 +34,7 @@ SELECT AsList(3, 2, 1), AsTuple(TRUE), ($x) -> { - RETURN AsTuple($x) + RETURN AsTuple($x); } ) ; @@ -44,7 +44,7 @@ SELECT AsList(3, 2, 1), AsTuple(TRUE, TRUE), ($x) -> { - RETURN AsTuple($x, $x) + RETURN AsTuple($x, $x); } ) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql index 7bf18bc65c0..f111a4a0a7a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql @@ -23,7 +23,7 @@ $sorted = ($world, $input, $orderByColumns, $asc) -> { $x, ListCode(ListReplicate(ReprCode($asc), $n)), $keySelector - ) + ); } ) ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql index dd4c29411cf..076f511afa0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql @@ -24,7 +24,7 @@ $splitter = ($row) -> { WHEN 1 THEN VARIANT ($row, "1", $varType) WHEN 2 THEN VARIANT ($row, "2", $varType) ELSE VARIANT ($row, "3", $varType) - END + END; }; $a, $b, $c, $d = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql index 3d171c64796..729ede6ba1b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql @@ -24,7 +24,7 @@ $splitter = ($row) -> { WHEN 1 THEN VARIANT ($row, "1", $varType) WHEN 2 THEN VARIANT ($row, "2", $varType) ELSE VARIANT ($row, "3", $varType) - END + END; }; $a, $b, $c, $d = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql index fac60f67ed7..cd51aa5615b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql @@ -20,7 +20,7 @@ $udf = YQL::@@ $r = ( REDUCE Input, AS_TABLE(ListMap( ListFromRange(0, 10), ($val) -> { - RETURN AsStruct(CAST($val AS String) AS key, CAST($val AS String) AS subkey, CAST($val AS String) AS value) + RETURN AsStruct(CAST($val AS String) AS key, CAST($val AS String) AS subkey, CAST($val AS String) AS value); } )) ON diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql index 762f8110028..2b94bfe8cfd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql @@ -3,7 +3,7 @@ USE plato; $udf_stream = ($input) -> { - RETURN $input + RETURN $input; }; $res = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql index b20f9ad5abf..7d61491a1a5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql @@ -2,7 +2,7 @@ USE plato; $x = ($key) -> { - RETURN "aa" || $key + RETURN "aa" || $key; }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql index be2e1c7f890..834350e6643 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql @@ -2,7 +2,7 @@ USE plato; $predicate = ($x) -> { - RETURN $x == "911" + RETURN $x == "911"; }; $field = "field"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql index 2f739fef579..7ed25c788a1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql @@ -30,7 +30,7 @@ SELECT count(*) FROM filter("", ($x) -> { - RETURN $x == "Input" + RETURN $x == "Input"; }) ; @@ -38,7 +38,7 @@ SELECT count(*) FROM filter_strict("", ($x) -> { - RETURN $x == "Input" + RETURN $x == "Input"; }) ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql index 9553b7ceda7..c8488e8a0a7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql @@ -2,31 +2,31 @@ /* postgres can not */ /* syntax version 1 */ $create = ($item, $_parent) -> { - RETURN AsList($item) + RETURN AsList($item); }; $add = ($state, $item, $_parent) -> { - RETURN Yql::Append($state, $item) + RETURN Yql::Append($state, $item); }; $merge = ($state1, $state2) -> { - RETURN ListExtend($state1, $state2) + RETURN ListExtend($state1, $state2); }; $get_result = ($state) -> { - RETURN $state + RETURN $state; }; $serialize = ($state) -> { - RETURN $state + RETURN $state; }; $deserialize = ($state) -> { - RETURN $state + RETURN $state; }; $default = ($result_type) -> { - RETURN Yql::List($result_type) + RETURN Yql::List($result_type); }; $udaf_factory = AGGREGATION_FACTORY( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql index cb377dd1217..3e9c49383c0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql @@ -1,26 +1,26 @@ /* postgres can not */ $create = ($item, $_parent) -> { - RETURN $item + RETURN $item; }; $add = ($state, $item, $_parent) -> { - RETURN $item + $state + RETURN $item + $state; }; $merge = ($state1, $state2) -> { - RETURN $state1 + $state2 + RETURN $state1 + $state2; }; $get_result = ($state) -> { - RETURN $state + RETURN $state; }; $serialize = ($state) -> { - RETURN $state + RETURN $state; }; $deserialize = ($state) -> { - RETURN $state + RETURN $state; }; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql index 10d183692d0..ebd59427ed7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql @@ -17,10 +17,10 @@ $members = StructTypeComponents(ListItemType(TypeHandle(TypeOf($i)))); $filteredMembers = ListFilter( ListMap( $members, ($x) -> { - RETURN $x.Name + RETURN $x.Name; } ), ($x) -> { - RETURN $x > "k" + RETURN $x > "k"; } ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql index f8cccaa66a6..1da88456a07 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql @@ -33,27 +33,27 @@ $my_table = ; $cnt_create = ($_item, $_parent) -> { - RETURN 1ul + RETURN 1ul; }; $cnt_add = ($state, $_item, $_parent) -> { - RETURN 1ul + $state + RETURN 1ul + $state; }; $cnt_merge = ($state1, $state2) -> { - RETURN $state1 + $state2 + RETURN $state1 + $state2; }; $cnt_get_result = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_serialize = ($state) -> { - RETURN $state + RETURN $state; }; $cnt_deserialize = ($state) -> { - RETURN $state + RETURN $state; }; -- non-trivial default value |