diff options
| author | udovichenko-r <rvu@ydb.tech> | 2023-01-16 13:08:30 +0300 |
|---|---|---|
| committer | udovichenko-r <rvu@ydb.tech> | 2023-01-16 13:08:30 +0300 |
| commit | 39b48d016639a9fe02f2ef4d2b6da101b93ea179 (patch) | |
| tree | 694cc8727098a492550bb59bcc9ea70d49216d3c | |
| parent | 57925e8af0cd20d6bddd073d7f5ab3b35f1ff2a0 (diff) | |
| download | ydb-39b48d016639a9fe02f2ef4d2b6da101b93ea179.tar.gz | |
[yql] Remove SqueezeToList from DqBuildPartitionsStage optimizer
11 files changed, 15 insertions, 29 deletions
diff --git a/ydb/library/yql/dq/opt/dq_opt_phy.cpp b/ydb/library/yql/dq/opt/dq_opt_phy.cpp index 37a087f3766..9649f8306a0 100644 --- a/ydb/library/yql/dq/opt/dq_opt_phy.cpp +++ b/ydb/library/yql/dq/opt/dq_opt_phy.cpp @@ -220,15 +220,11 @@ TExprBase DqBuildPartitionsStageStub(TExprBase node, TExprContext& ctx, const TP if (ETypeAnnotationKind::List == partition.Input().Ref().GetTypeAnn()->GetKind()) { handler = Build<TCoLambda>(ctx, handler.Pos()) .Args({"flow"}) - .template Body<TCoFlatMap>() - .template Input<TCoSqueezeToList>() - .Stream("flow") - .Build() - .Lambda() - .Args({"list"}) - .template Body<TExprApplier>() - .Apply(handler) - .With(0, "list") + .template Body<TCoToFlow>() + .template Input<TExprApplier>() + .Apply(handler) + .template With<TCoForwardList>(0) + .Stream("flow") .Build() .Build() .Build().Done(); diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan index fcd0dad63ba..de074d9afec 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan @@ -214,12 +214,7 @@ "PlanNodeType": "Connection" } ], - "Operators": [ - { - "Name": "Aggregate" - } - ], - "Node Type": "Aggregate" + "Node Type": "Stage" } ], "Node Type": "UnionAll", diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan index f244160552b..8d6363656ac 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan @@ -187,12 +187,7 @@ "PlanNodeType": "Connection" } ], - "Operators": [ - { - "Name": "Aggregate" - } - ], - "Node Type": "Aggregate" + "Node Type": "Stage" } ], "Node Type": "UnionAll", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan index 5c2d95d99ed..f090fbb8745 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/a\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"code (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"code\"\n ]\n }\n ]\n },\n {\n \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/b\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"a (-\u221e, +\u221e)\",\n \"num (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"a\"\n ]\n }\n ]\n },\n {\n \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/c\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"name (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"a\",\n \"name\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":18,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":17,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":16,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"row.name\"\n },\n {\n \"Name\":\"LeftJoin (MapJoin)\"\n }\n ],\n \"PlanNodeId\":15,\n \"Plans\":\n [\n {\n \"Node Type\":\"Broadcast\",\n \"PlanNodeId\":12,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Collect\",\n \"PlanNodeId\":11,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":10,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"LeftJoin (MapJoin)\",\n \"Operators\":\n [\n {\n \"Name\":\"LeftJoin (MapJoin)\"\n }\n ],\n \"PlanNodeId\":9,\n \"Plans\":\n [\n {\n \"Node Type\":\"Broadcast\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Collect\",\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Aggregate\",\n \"Operators\":\n [\n {\n \"Name\":\"Aggregate\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"a\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"a\"\n ],\n \"ReadRanges\":\n [\n \"a (-\u221e, +\u221e)\",\n \"num (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_jointest\\/join4.test_plan\\/b\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_jointest\\/join4.test_plan\\/b\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n },\n {\n \"Node Type\":\"Map\",\n \"PlanNodeId\":8,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"code\"\n ],\n \"ReadRanges\":\n [\n \"code (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_jointest\\/join4.test_plan\\/a\"\n }\n ],\n \"PlanNodeId\":7,\n \"Tables\":\n [\n \"postgres_jointest\\/join4.test_plan\\/a\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n },\n {\n \"Node Type\":\"Map\",\n \"PlanNodeId\":14,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"a\",\n \"name\"\n ],\n \"ReadRanges\":\n [\n \"name (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_jointest\\/join4.test_plan\\/c\"\n }\n ],\n \"PlanNodeId\":13,\n \"Tables\":\n [\n \"postgres_jointest\\/join4.test_plan\\/c\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"name (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/a\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"code (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"code\"\n ]\n }\n ]\n },\n {\n \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/b\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"a (-\u221e, +\u221e)\",\n \"num (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"a\"\n ]\n }\n ]\n },\n {\n \"name\":\"\\/Root\\/postgres_jointest\\/join4.test_plan\\/c\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"name (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"a\",\n \"name\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":18,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":17,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":16,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-LeftJoin (MapJoin)\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"row.name\"\n },\n {\n \"Name\":\"LeftJoin (MapJoin)\"\n }\n ],\n \"PlanNodeId\":15,\n \"Plans\":\n [\n {\n \"Node Type\":\"Broadcast\",\n \"PlanNodeId\":12,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Collect\",\n \"PlanNodeId\":11,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":10,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"LeftJoin (MapJoin)\",\n \"Operators\":\n [\n {\n \"Name\":\"LeftJoin (MapJoin)\"\n }\n ],\n \"PlanNodeId\":9,\n \"Plans\":\n [\n {\n \"Node Type\":\"Broadcast\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Collect\",\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Stage\",\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"a\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"a\"\n ],\n \"ReadRanges\":\n [\n \"a (-\u221e, +\u221e)\",\n \"num (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_jointest\\/join4.test_plan\\/b\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_jointest\\/join4.test_plan\\/b\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n },\n {\n \"Node Type\":\"Map\",\n \"PlanNodeId\":8,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"code\"\n ],\n \"ReadRanges\":\n [\n \"code (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_jointest\\/join4.test_plan\\/a\"\n }\n ],\n \"PlanNodeId\":7,\n \"Tables\":\n [\n \"postgres_jointest\\/join4.test_plan\\/a\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n },\n {\n \"Node Type\":\"Map\",\n \"PlanNodeId\":14,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"a\",\n \"name\"\n ],\n \"ReadRanges\":\n [\n \"name (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_jointest\\/join4.test_plan\\/c\"\n }\n ],\n \"PlanNodeId\":13,\n \"Tables\":\n [\n \"postgres_jointest\\/join4.test_plan\\/c\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"name (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan index 887f4d6cb74..39d804ab7b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":8,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":7,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.nsum\"\n },\n {\n \"Iterator\":\"item\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n },\n {\n \"Iterator\":\"list\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"depname (Asc)\",\n \"salary (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":8,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":7,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.nsum\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Sort\",\n \"Operators\":\n [\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"depname (Asc)\",\n \"salary (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan index 72ac8034540..af63e044930 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n },\n {\n \"Iterator\":\"list\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"depname (Asc)\",\n \"rank (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"depname (Asc)\",\n \"rank (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan index 72ac8034540..af63e044930 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n },\n {\n \"Iterator\":\"list\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"depname (Asc)\",\n \"rank (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"depname (Asc)\",\n \"rank (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan index c31c2e03f80..0bf01d0447e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n },\n {\n \"Iterator\":\"list\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"rank (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"empno\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"rank (Asc)\",\n \"empno (Asc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan index 7a74527e2e4..4689beca4cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":10,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":9,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":8,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"row.row_number\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.depname\"\n },\n {\n \"Iterator\":\"item\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":7,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.depname\"\n },\n {\n \"Iterator\":\"list\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Aggregate\",\n \"Operators\":\n [\n {\n \"Name\":\"Aggregate\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"row_number (Desc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":10,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":9,\n \"Plans\":\n [\n {\n \"Node Type\":\"Merge\",\n \"PlanNodeId\":8,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TopSort-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"TopSort\",\n \"TopSortBy\":\"row.row_number\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.depname\"\n }\n ],\n \"PlanNodeId\":7,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Sort\",\n \"Operators\":\n [\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.depname\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Stage\",\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ],\n \"SortColumns\":\n [\n \"row_number (Desc)\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan index 0db211a7986..65dfd416f2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n },\n {\n \"Iterator\":\"item\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan index 6f08cba68d3..9ce8ffcfbad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_7.plan @@ -1 +1 @@ -"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit-Sort-ConstantExpr\",\n \"Operators\":\n [\n {\n \"Inputs\":\n [\n 1,\n 2\n ],\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n },\n {\n \"Iterator\":\"item\",\n \"Name\":\"Iterator\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file +"{\n \"meta\":\n {\n \"version\":\"0.2\",\n \"type\":\"query\"\n },\n \"tables\":[\n {\n \"name\":\"\\/Root\\/postgres_window.test_plan\\/empsalary\",\n \"reads\":\n [\n {\n \"type\":\"FullScan\",\n \"scan_by\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"columns\":\n [\n \"depname\",\n \"salary\"\n ]\n }\n ]\n }\n],\n \"Plan\":\n {\n \"Node Type\":\"Query\",\n \"PlanNodeType\":\"Query\",\n \"Plans\":\n [\n {\n \"Node Type\":\"ResultSet\",\n \"PlanNodeId\":6,\n \"PlanNodeType\":\"ResultSet\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n }\n ],\n \"PlanNodeId\":5,\n \"Plans\":\n [\n {\n \"Node Type\":\"UnionAll\",\n \"PlanNodeId\":4,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"Limit-Sort\",\n \"Operators\":\n [\n {\n \"Limit\":\"1001\",\n \"Name\":\"Limit\"\n },\n {\n \"Name\":\"Sort\",\n \"SortBy\":\"row.salary\"\n }\n ],\n \"PlanNodeId\":3,\n \"Plans\":\n [\n {\n \"KeyColumns\":\n [\n \"depname\"\n ],\n \"Node Type\":\"HashShuffle\",\n \"PlanNodeId\":2,\n \"PlanNodeType\":\"Connection\",\n \"Plans\":\n [\n {\n \"Node Type\":\"TableFullScan\",\n \"Operators\":\n [\n {\n \"Name\":\"TableFullScan\",\n \"ReadColumns\":\n [\n \"depname\",\n \"salary\"\n ],\n \"ReadRanges\":\n [\n \"empno (-\u221e, +\u221e)\"\n ],\n \"Table\":\"postgres_window.test_plan\\/empsalary\"\n }\n ],\n \"PlanNodeId\":1,\n \"Tables\":\n [\n \"postgres_window.test_plan\\/empsalary\"\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n ]\n }\n}"
\ No newline at end of file |