aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorareredify <areredify@yandex-team.com>2023-11-20 13:04:37 +0300
committerareredify <areredify@yandex-team.com>2023-11-20 14:17:35 +0300
commit6d8d9a430dea2bfa0e6ce219a8e4f62f02fd2884 (patch)
tree7414ee56049f6c4a23b7977f841edeac22a4ea42
parent398a47a27270e9067271b9595dc33a9e8c4c16cd (diff)
downloadydb-6d8d9a430dea2bfa0e6ce219a8e4f62f02fd2884.tar.gz
fix window formatting in expressions
bless tests add correct window formatting in expressions
-rw-r--r--ydb/library/yql/sql/v1/format/sql_format.cpp46
-rw-r--r--ydb/library/yql/sql/v1/format/sql_format_ut.cpp16
-rw-r--r--ydb/library/yql/tests/sql/sql2yql/canondata/result.json150
-rw-r--r--ydb/library/yql/tests/sql/suites/column_order/insert_with_new_cols.sql1
-rw-r--r--ydb/library/yql/tests/sql/suites/column_order/winfunc.sql1
-rw-r--r--ydb/library/yql/tests/sql/suites/expr/double_join_with_list_from_range.sql1
-rw-r--r--ydb/library/yql/tests/sql/suites/window/full/syscolumns.sql1
-rw-r--r--ydb/library/yql/tests/sql/suites/window/win_inline_spec.sql1
-rw-r--r--ydb/library/yql/tests/sql/suites/window/yql-14479.sql1
-rw-r--r--ydb/library/yql/tests/sql/suites/window/yql-14738.sql1
10 files changed, 127 insertions, 92 deletions
diff --git a/ydb/library/yql/sql/v1/format/sql_format.cpp b/ydb/library/yql/sql/v1/format/sql_format.cpp
index adafe0fa5c..c7d53b9981 100644
--- a/ydb/library/yql/sql/v1/format/sql_format.cpp
+++ b/ydb/library/yql/sql/v1/format/sql_format.cpp
@@ -265,6 +265,7 @@ private:
struct TTokenInfo {
bool OpeningBracket = false;
bool ClosingBracket = false;
+ bool BracketForcedExpansion = false;
ui32 ClosingBracketIndex = 0;
};
@@ -343,6 +344,17 @@ private:
if (value.Alt_case() == TRule_select_kind_parenthesis::kAltSelectKindParenthesis2) {
suppressExpr = true;
}
+ } else if (descr == TRule_window_specification::GetDescriptor()) {
+ const auto& value = dynamic_cast<const TRule_window_specification&>(msg);
+ const auto& details = value.GetRule_window_specification_details2();
+ const bool needsNewline = details.HasBlock1() || details.HasBlock2() ||
+ details.HasBlock3() || details.HasBlock4();
+ if (needsNewline) {
+ auto& paren = value.GetToken1();
+ ForceExpandedColumn = paren.GetColumn();
+ ForceExpandedLine = paren.GetLine();
+ }
+ suppressExpr = true;
}
const bool expr = (descr == TRule_expr::GetDescriptor() || descr == TRule_in_expr::GetDescriptor());
@@ -402,11 +414,17 @@ private:
void PopBracket(const TString& expected) {
Y_ENSURE(!MarkTokenStack.empty());
Y_ENSURE(MarkTokenStack.back() < ParsedTokens.size());
- Y_ENSURE(ParsedTokens[MarkTokenStack.back()].Content == expected);
+ auto& openToken = ParsedTokens[MarkTokenStack.back()];
+ Y_ENSURE(openToken.Content == expected);
auto& openInfo = MarkedTokens[MarkTokenStack.back()];
+ auto& closeInfo = MarkedTokens[TokenIndex];
+ const bool forcedExpansion = openToken.Line == ForceExpandedLine && openToken.LinePos <= ForceExpandedColumn;
+
if (openInfo.OpeningBracket) {
openInfo.ClosingBracketIndex = TokenIndex;
- MarkedTokens[TokenIndex].ClosingBracket = true;
+ openInfo.BracketForcedExpansion = forcedExpansion;
+ closeInfo.BracketForcedExpansion = forcedExpansion;
+ closeInfo.ClosingBracket = true;
}
MarkTokenStack.pop_back();
@@ -1290,7 +1308,7 @@ private:
if (markedInfo.ClosingBracket) {
Y_ENSURE(!MarkTokenStack.empty());
auto beginTokenIndex = MarkTokenStack.back();
- if (ParsedTokens[beginTokenIndex].Line != ParsedTokens[TokenIndex].Line) {
+ if (markedInfo.BracketForcedExpansion || ParsedTokens[beginTokenIndex].Line != ParsedTokens[TokenIndex].Line) {
// multiline
PopCurrentIndent();
NewLine();
@@ -1306,7 +1324,7 @@ private:
if (markedInfo.OpeningBracket) {
MarkTokenStack.push_back(TokenIndex);
- if (ParsedTokens[TokenIndex].Line != ParsedTokens[markedInfo.ClosingBracketIndex].Line) {
+ if (markedInfo.BracketForcedExpansion || ParsedTokens[TokenIndex].Line != ParsedTokens[markedInfo.ClosingBracketIndex].Line) {
// multiline
PushCurrentIndent();
NewLine();
@@ -1850,9 +1868,14 @@ private:
void VisitWindowSpecification(const TRule_window_specification& msg) {
Visit(msg.GetToken1());
- NewLine();
- PushCurrentIndent();
const auto& details = msg.GetRule_window_specification_details2();
+ const bool needsNewline = details.HasBlock1() || details.HasBlock2() ||
+ details.HasBlock3() || details.HasBlock4();
+ if (needsNewline) {
+ NewLine();
+ PushCurrentIndent();
+ }
+
if (details.HasBlock1()) {
NewLine();
Visit(details.GetBlock1());
@@ -1873,8 +1896,11 @@ private:
Visit(details.GetBlock4());
}
- NewLine();
- PopCurrentIndent();
+ if (needsNewline) {
+ NewLine();
+ PopCurrentIndent();
+ }
+
Visit(msg.GetToken3());
}
@@ -2010,7 +2036,9 @@ private:
bool AfterDigits = false;
bool AfterQuestion = false;
bool AfterLess = false;
- bool AfterKeyExpr = false;
+ bool AfterKeyExpr = false;
+ ui32 ForceExpandedLine = 0;
+ ui32 ForceExpandedColumn = 0;
ui32 TokenIndex = 0;
TMarkTokenStack MarkTokenStack;
diff --git a/ydb/library/yql/sql/v1/format/sql_format_ut.cpp b/ydb/library/yql/sql/v1/format/sql_format_ut.cpp
index d714101498..fd104f14e4 100644
--- a/ydb/library/yql/sql/v1/format/sql_format_ut.cpp
+++ b/ydb/library/yql/sql/v1/format/sql_format_ut.cpp
@@ -790,7 +790,7 @@ Y_UNIT_TEST_SUITE(CheckSqlFormatter) {
{"select 1 from user assume order by key",
"SELECT\n\t1\nFROM user\nASSUME ORDER BY\n\tkey;\n\n"},
{"select 1 from user window w1 as (), w2 as ()",
- "SELECT\n\t1\nFROM user\nWINDOW\n\tw1 AS (\n\t),\n\tw2 AS (\n\t);\n\n"},
+ "SELECT\n\t1\nFROM user\nWINDOW\n\tw1 AS (),\n\tw2 AS ();\n\n"},
{"select 1 from user window w1 as (user)",
"SELECT\n\t1\nFROM user\nWINDOW\n\tw1 AS (\n\t\tuser\n\t);\n\n"},
{"select 1 from user window w1 as (partition by user)",
@@ -1366,4 +1366,18 @@ FROM Input MATCH_RECOGNIZE (PATTERN (A) DEFINE A AS A);
TSetup setup;
setup.Run(cases);
}
+
+ Y_UNIT_TEST(WindowFunctionInsideExpr) {
+ TCases cases = {
+ {"SELECT CAST(ROW_NUMBER() OVER () AS String) AS x,\nFROM Input;",
+ "SELECT\n\tCAST(ROW_NUMBER() OVER () AS String) AS x,\nFROM Input;\n\n"},
+ {"SELECT CAST(ROW_NUMBER() OVER (PARTITION BY key) AS String) AS x,\nFROM Input;",
+ "SELECT\n\tCAST(\n\t\tROW_NUMBER() OVER (\n\t\t\tPARTITION BY\n\t\t\t\tkey\n\t\t) AS String\n\t) AS x,\nFROM Input;\n\n"},
+ {"SELECT CAST(ROW_NUMBER() OVER (users) AS String) AS x,\nFROM Input;",
+ "SELECT\n\tCAST(\n\t\tROW_NUMBER() OVER (\n\t\t\tusers\n\t\t) AS String\n\t) AS x,\nFROM Input;\n\n"},
+ };
+
+ TSetup setup;
+ setup.Run(cases);
+ }
}
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index 50898566af..e8b5c64ccd 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -20714,9 +20714,9 @@
],
"test_sql_format.test[column_order-insert_with_new_cols]": [
{
- "checksum": "9c63984536a215d341dcd560b183ea45",
- "size": 253,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql"
+ "checksum": "bdcf9cfbf5526dcd174dded79a9eab89",
+ "size": 229,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql"
}
],
"test_sql_format.test[column_order-insert_with_reorder_cols]": [
@@ -20868,9 +20868,9 @@
],
"test_sql_format.test[column_order-winfunc]": [
{
- "checksum": "4604de52c752f4ac79513489218e8217",
- "size": 261,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_column_order-winfunc_/formatted.sql"
+ "checksum": "776627f6073f0d8b9fa5129aa66ddb5f",
+ "size": 236,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_column_order-winfunc_/formatted.sql"
}
],
"test_sql_format.test[compute_range-adjacent_to_point]": [
@@ -21799,9 +21799,9 @@
],
"test_sql_format.test[expr-as_table_emptylist]": [
{
- "checksum": "3a3d41f908eb35c8cd59620d09c86ca2",
- "size": 789,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_expr-as_table_emptylist_/formatted.sql"
+ "checksum": "9a55f7ebd48349d759d7baae85be3b3c",
+ "size": 784,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_expr-as_table_emptylist_/formatted.sql"
}
],
"test_sql_format.test[expr-as_tuple_syntax]": [
@@ -22002,9 +22002,9 @@
],
"test_sql_format.test[expr-double_join_with_list_from_range]": [
{
- "checksum": "e2e4fb29b0f78bbbe875e1410587593a",
- "size": 665,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_expr-double_join_with_list_from_range_/formatted.sql"
+ "checksum": "dd8cdf1a20687910bd9c297773f80fbf",
+ "size": 641,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_expr-double_join_with_list_from_range_/formatted.sql"
}
],
"test_sql_format.test[expr-empty_dict_ops]": [
@@ -23339,9 +23339,9 @@
],
"test_sql_format.test[hor_join-row_num_per_sect]": [
{
- "checksum": "3b8481c110f66e5a8100b96204c8b4cf",
- "size": 461,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_hor_join-row_num_per_sect_/formatted.sql"
+ "checksum": "d68f82fdaa10cae7f81fb7e14d449925",
+ "size": 443,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_hor_join-row_num_per_sect_/formatted.sql"
}
],
"test_sql_format.test[hor_join-runtime_dep]": [
@@ -25299,9 +25299,9 @@
],
"test_sql_format.test[join-pullup_rownumber]": [
{
- "checksum": "ba41a879c221c9e3264f489cd74bb407",
- "size": 334,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_join-pullup_rownumber_/formatted.sql"
+ "checksum": "98ec649def0f089d56354860e2005c19",
+ "size": 325,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_join-pullup_rownumber_/formatted.sql"
}
],
"test_sql_format.test[join-pushdown_filter_over_inner_with_assume_strict]": [
@@ -26580,9 +26580,9 @@
],
"test_sql_format.test[lineage-window_asstruct]": [
{
- "checksum": "607fea084752a6959aceb7ce699a3d78",
- "size": 153,
- "uri": "https://{canondata_backend}/1130705/a2e68ae5dc8372c4a36c0b5edeec6a3aa999b74c/resource.tar.gz#test_sql_format.test_lineage-window_asstruct_/formatted.sql"
+ "checksum": "0252d16dbbddce46d1356cc11f63208f",
+ "size": 144,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_lineage-window_asstruct_/formatted.sql"
}
],
"test_sql_format.test[lineage-window_many]": [
@@ -26601,16 +26601,16 @@
],
"test_sql_format.test[lineage-window_one]": [
{
- "checksum": "59395e1f02e5cef180bd62ef8ee3c9b5",
- "size": 90,
- "uri": "https://{canondata_backend}/1917492/26bf348e29f951ddb08d448541f24a709498b3c0/resource.tar.gz#test_sql_format.test_lineage-window_one_/formatted.sql"
+ "checksum": "1c2ac7fcb855177314727981fc3b1a99",
+ "size": 85,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_lineage-window_one_/formatted.sql"
}
],
"test_sql_format.test[lineage-window_tablerow]": [
{
- "checksum": "85581d3bb093f297799d0ba1b3fd8513",
- "size": 143,
- "uri": "https://{canondata_backend}/1130705/a2e68ae5dc8372c4a36c0b5edeec6a3aa999b74c/resource.tar.gz#test_sql_format.test_lineage-window_tablerow_/formatted.sql"
+ "checksum": "a9dc08b7d132d431a92826385af68605",
+ "size": 134,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_lineage-window_tablerow_/formatted.sql"
}
],
"test_sql_format.test[match_recognize-alerts-streaming]": [
@@ -29464,9 +29464,9 @@
],
"test_sql_format.test[select-tablename_with_table_row]": [
{
- "checksum": "7ac4cfe48b33b011059d9611bdeb8ad6",
- "size": 131,
- "uri": "https://{canondata_backend}/1937424/0db6c351c76d2a197c426ee33bb3e27b39b98c82/resource.tar.gz#test_sql_format.test_select-tablename_with_table_row_/formatted.sql"
+ "checksum": "79856aacadd971b588c0ff2e46389539",
+ "size": 126,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_select-tablename_with_table_row_/formatted.sql"
}
],
"test_sql_format.test[select-tablepathprefix]": [
@@ -30976,9 +30976,9 @@
],
"test_sql_format.test[window-full/aggregations]": [
{
- "checksum": "4744e967832a8befe8d0cb6acf0545b1",
- "size": 603,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-full_aggregations_/formatted.sql"
+ "checksum": "61799c85812ea5ecf32f8e38ba3400f4",
+ "size": 598,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-full_aggregations_/formatted.sql"
}
],
"test_sql_format.test[window-full/aggregations_compact]": [
@@ -31074,9 +31074,9 @@
],
"test_sql_format.test[window-full/syscolumns]": [
{
- "checksum": "cf8b6fc8276fc03349ba8b56c54dc15a",
- "size": 479,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_window-full_syscolumns_/formatted.sql"
+ "checksum": "85176ff3d4f162ace73cc48f10217c2c",
+ "size": 455,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_window-full_syscolumns_/formatted.sql"
}
],
"test_sql_format.test[window-generic/aggregations_after_current]": [
@@ -31228,37 +31228,37 @@
],
"test_sql_format.test[window-row_number_no_part_from_subq]": [
{
- "checksum": "f39eef506c05958fcae8073f267d2ec4",
- "size": 179,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-row_number_no_part_from_subq_/formatted.sql"
+ "checksum": "288b965b7584d0362197764edd51f6b6",
+ "size": 174,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-row_number_no_part_from_subq_/formatted.sql"
}
],
"test_sql_format.test[window-row_number_no_part_multi_input]": [
{
- "checksum": "33455cdf8211a7ac7e5e7f5828a36cd0",
- "size": 347,
- "uri": "https://{canondata_backend}/1130705/a2e68ae5dc8372c4a36c0b5edeec6a3aa999b74c/resource.tar.gz#test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql"
+ "checksum": "517804a886e517afc987c8dc2e55c53c",
+ "size": 342,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql"
}
],
"test_sql_format.test[window-row_number_to_map]": [
{
- "checksum": "f1ff056df14e4971ff26d45616abc78d",
- "size": 603,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-row_number_to_map_/formatted.sql"
+ "checksum": "eadb33afc651a5581584bdce00ff1fa3",
+ "size": 598,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-row_number_to_map_/formatted.sql"
}
],
"test_sql_format.test[window-row_number_to_map_multiple]": [
{
- "checksum": "ac5e234716df7fa3a5a4a1df4f501182",
- "size": 434,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-row_number_to_map_multiple_/formatted.sql"
+ "checksum": "b60365d88c0b02fb80e6254c662b6ab6",
+ "size": 429,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-row_number_to_map_multiple_/formatted.sql"
}
],
"test_sql_format.test[window-row_number_to_map_noncompact]": [
{
- "checksum": "1ea81efdcbbec5fa6263d74afbb0b99f",
- "size": 175,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-row_number_to_map_noncompact_/formatted.sql"
+ "checksum": "ca888bf84cfe8d78384318f5175d4472",
+ "size": 170,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-row_number_to_map_noncompact_/formatted.sql"
}
],
"test_sql_format.test[window-udaf_no_merge]": [
@@ -31445,9 +31445,9 @@
],
"test_sql_format.test[window-win_func_lead_lag_opt]": [
{
- "checksum": "3d3987600de40eb5dd971da287f62ddb",
- "size": 585,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-win_func_lead_lag_opt_/formatted.sql"
+ "checksum": "2085be905616083f89704142e96efc93",
+ "size": 570,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-win_func_lead_lag_opt_/formatted.sql"
}
],
"test_sql_format.test[window-win_func_lead_lag_worm]": [
@@ -31480,9 +31480,9 @@
],
"test_sql_format.test[window-win_func_on_cloned_source]": [
{
- "checksum": "5895305179e8d93460e555e6a8ed4110",
- "size": 257,
- "uri": "https://{canondata_backend}/1130705/a2e68ae5dc8372c4a36c0b5edeec6a3aa999b74c/resource.tar.gz#test_sql_format.test_window-win_func_on_cloned_source_/formatted.sql"
+ "checksum": "2d127464ac72b12a4cc0b8aae52e6535",
+ "size": 248,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-win_func_on_cloned_source_/formatted.sql"
}
],
"test_sql_format.test[window-win_func_order_by_udf_empty_rank]": [
@@ -31599,23 +31599,23 @@
],
"test_sql_format.test[window-win_group_peephole]": [
{
- "checksum": "03fe242474a04c7078e26c2550e20263",
- "size": 422,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-win_group_peephole_/formatted.sql"
+ "checksum": "93ed550f20e9f5435c9df5a3709f666e",
+ "size": 417,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-win_group_peephole_/formatted.sql"
}
],
"test_sql_format.test[window-win_inline_spec]": [
{
- "checksum": "8c2713c4e074bd98b4cd5f8ae35a2537",
- "size": 434,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_window-win_inline_spec_/formatted.sql"
+ "checksum": "79a2426037a6e27ef356fd7ea0179237",
+ "size": 410,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_window-win_inline_spec_/formatted.sql"
}
],
"test_sql_format.test[window-win_lead_in_mem]": [
{
- "checksum": "9da639d56764d0cb3966c0caa1c18c54",
- "size": 378,
- "uri": "https://{canondata_backend}/1599023/4bd7e6892a9762eec433e60bda88f20cddadc74c/resource.tar.gz#test_sql_format.test_window-win_lead_in_mem_/formatted.sql"
+ "checksum": "f183d3e87e8b572b3335622c22b1bb8e",
+ "size": 373,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-win_lead_in_mem_/formatted.sql"
}
],
"test_sql_format.test[window-win_multiaggr]": [
@@ -31711,23 +31711,23 @@
],
"test_sql_format.test[window-yql-14479]": [
{
- "checksum": "0d62ce2591f38a19ad3c9fb2d38ccbac",
- "size": 323,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_window-yql-14479_/formatted.sql"
+ "checksum": "467b53a0e94272fc9c05b70a38b1a1b2",
+ "size": 299,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_window-yql-14479_/formatted.sql"
}
],
"test_sql_format.test[window-yql-14738]": [
{
- "checksum": "28319715f7047796eff46d6acb4a20e5",
- "size": 387,
- "uri": "https://{canondata_backend}/1937424/611f260117a280fcc35d3a793ed45a00a0077323/resource.tar.gz#test_sql_format.test_window-yql-14738_/formatted.sql"
+ "checksum": "22206dd425d0680e148f36796c3e98e6",
+ "size": 363,
+ "uri": "https://{canondata_backend}/1937424/433fb6c2ab1b7261d5fc53cae93bec24a6310cee/resource.tar.gz#test_sql_format.test_window-yql-14738_/formatted.sql"
}
],
"test_sql_format.test[window-yql-15636]": [
{
- "checksum": "d967a8d0cfb85295fa52a97ba339522b",
- "size": 752,
- "uri": "https://{canondata_backend}/1925821/aeddf2bb85ad22d5cb1dd10f889edcbbe03627bd/resource.tar.gz#test_sql_format.test_window-yql-15636_/formatted.sql"
+ "checksum": "29060bdb9ef53fa2341448175861d038",
+ "size": 720,
+ "uri": "https://{canondata_backend}/1942100/b92ac69368a13b36fb0b2cb1137bd4b179347da7/resource.tar.gz#test_sql_format.test_window-yql-15636_/formatted.sql"
}
],
"test_sql_format.test[ypath-complex]": [
diff --git a/ydb/library/yql/tests/sql/suites/column_order/insert_with_new_cols.sql b/ydb/library/yql/tests/sql/suites/column_order/insert_with_new_cols.sql
index 0127f4d3aa..54c1afc925 100644
--- a/ydb/library/yql/tests/sql/suites/column_order/insert_with_new_cols.sql
+++ b/ydb/library/yql/tests/sql/suites/column_order/insert_with_new_cols.sql
@@ -1,6 +1,5 @@
/* postgres can not */
/* syntax version 1 */
-/* skip double format */
use plato;
pragma OrderedColumns;
diff --git a/ydb/library/yql/tests/sql/suites/column_order/winfunc.sql b/ydb/library/yql/tests/sql/suites/column_order/winfunc.sql
index ac5947829a..eb5751334a 100644
--- a/ydb/library/yql/tests/sql/suites/column_order/winfunc.sql
+++ b/ydb/library/yql/tests/sql/suites/column_order/winfunc.sql
@@ -1,4 +1,3 @@
-/* skip double format */
use plato;
pragma OrderedColumns;
diff --git a/ydb/library/yql/tests/sql/suites/expr/double_join_with_list_from_range.sql b/ydb/library/yql/tests/sql/suites/expr/double_join_with_list_from_range.sql
index 4050c65070..9a430a536d 100644
--- a/ydb/library/yql/tests/sql/suites/expr/double_join_with_list_from_range.sql
+++ b/ydb/library/yql/tests/sql/suites/expr/double_join_with_list_from_range.sql
@@ -1,5 +1,4 @@
/* postgres can not */
-/* skip double format */
$list = select lst, row_number() over (order by lst) as rn from (
select * from (
select ListFromRange(1us, 333us) as lst
diff --git a/ydb/library/yql/tests/sql/suites/window/full/syscolumns.sql b/ydb/library/yql/tests/sql/suites/window/full/syscolumns.sql
index fa2b18d678..d2533c062b 100644
--- a/ydb/library/yql/tests/sql/suites/window/full/syscolumns.sql
+++ b/ydb/library/yql/tests/sql/suites/window/full/syscolumns.sql
@@ -1,6 +1,5 @@
/* syntax version 1 */
/* postgres can not */
-/* skip double format */
use plato;
select
diff --git a/ydb/library/yql/tests/sql/suites/window/win_inline_spec.sql b/ydb/library/yql/tests/sql/suites/window/win_inline_spec.sql
index b239ea2195..b881a07689 100644
--- a/ydb/library/yql/tests/sql/suites/window/win_inline_spec.sql
+++ b/ydb/library/yql/tests/sql/suites/window/win_inline_spec.sql
@@ -1,5 +1,4 @@
/* syntax version 1 */
-/* skip double format */
select
key,
max(key) over (order by key) as running_max,
diff --git a/ydb/library/yql/tests/sql/suites/window/yql-14479.sql b/ydb/library/yql/tests/sql/suites/window/yql-14479.sql
index 2a0b4a0fee..bb0de0cb7f 100644
--- a/ydb/library/yql/tests/sql/suites/window/yql-14479.sql
+++ b/ydb/library/yql/tests/sql/suites/window/yql-14479.sql
@@ -1,6 +1,5 @@
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 4 */
/* ignore plan diff */
-/* skip double format */
USE plato;
SELECT a.*, row_number() OVER (PARTITION BY key, subkey) as rn, TableName() as tn
diff --git a/ydb/library/yql/tests/sql/suites/window/yql-14738.sql b/ydb/library/yql/tests/sql/suites/window/yql-14738.sql
index 120dd22265..b295b092c2 100644
--- a/ydb/library/yql/tests/sql/suites/window/yql-14738.sql
+++ b/ydb/library/yql/tests/sql/suites/window/yql-14738.sql
@@ -1,6 +1,5 @@
/* postgres can not */
/* syntax version 1 */
-/* skip double format */
USE plato;
SELECT