Revert rXXXXXX: correct avg in yql

Causes slowdown in q4,q5 scalar clickbench

11 files changed, 19 insertions, 47 deletions

diff --git a/ydb/library/yql/core/peephole_opt/yql_opt_peephole_physical.cpp b/ydb/library/yql/core/peephole_opt/yql_opt_peephole_physical.cpp
index 39ca0b99bbe..bb99838f052 100644
--- a/ydb/library/yql/core/peephole_opt/yql_opt_peephole_physical.cpp
+++ b/ydb/library/yql/core/peephole_opt/yql_opt_peephole_physical.cpp
@@ -4593,7 +4593,7 @@ TExprNode::TPtr OptimizeWideCombiner(const TExprNode::TPtr& node, TExprContext&
     tupleExpandMap.resize(originalStateSize);
     structExpandMap.resize(originalStateSize);
 
-    const auto needStateFlatten = GetExpandMapsForLambda<false>(*node->Child(3U), tupleExpandMap, structExpandMap);
+    const auto needStateFlatten = GetExpandMapsForLambda<true>(*node->Child(3U), tupleExpandMap, structExpandMap);
 
     if (needStateFlatten.front()) {
         const auto flattenSize = *needStateFlatten.front();
diff --git a/ydb/library/yql/mount/lib/yql/aggregate.yql b/ydb/library/yql/mount/lib/yql/aggregate.yql
index f17b9f55b97..51e2085c4a4 100644
--- a/ydb/library/yql/mount/lib/yql/aggregate.yql
+++ b/ydb/library/yql/mount/lib/yql/aggregate.yql
@@ -44,10 +44,10 @@
 # list_type:type init:lambda
 # doesn't support optional values
 (let count_traits_factory (lambda '(list_type init) (block '(
-  (let update (lambda '(value state) (AggrAdd state (Apply init value))))
+  (let update (lambda '(value state) (+ state (Apply init value))))
   (let save (lambda '(state) state))
   (let load (lambda '(state) state))
-  (let merge (lambda '(state1 state2) (AggrAdd state1 state2)))
+  (let merge (lambda '(state1 state2) (+ state1 state2)))
   (let finish (lambda '(state) state))
   (return (AggregationTraits (ListItemType list_type) init update save load merge finish (Uint64 '0)))
 ))))
@@ -59,7 +59,7 @@
   (let update (lambda '(value state) (AggrCountUpdate value state)))
   (let save (lambda '(state) state))
   (let load (lambda '(state) state))
-  (let merge (lambda '(state1 state2) (AggrAdd state1 state2)))
+  (let merge (lambda '(state1 state2) (+ state1 state2)))
   (let finish (lambda '(state) state))
   (return (AggregationTraits (ListItemType list_type) init update save load merge finish (Uint64 '0)))
 ))))
@@ -86,7 +86,7 @@
                                           ) (Inc (Nth state '1)))))
   (let save (lambda '(state) state))
   (let load (lambda '(state) state))
-  (let merge (lambda '(state1 state2) '((AggrAdd (Nth state1 '0) (Nth state2 '0)) (AggrAdd (Nth state1 '1) (Nth state2 '1)))))
+  (let merge (lambda '(state1 state2) '((+ (Nth state1 '0) (Nth state2 '0)) (+ (Nth state1 '1) (Nth state2 '1)))))
   (let finish (lambda '(state)
                 (MatchType (ListItemType list_type)
                            'Decimal
diff --git a/ydb/library/yql/mount/lib/yql/window.yql b/ydb/library/yql/mount/lib/yql/window.yql
index fad01f0f218..d915c3a103b 100644
--- a/ydb/library/yql/mount/lib/yql/window.yql
+++ b/ydb/library/yql/mount/lib/yql/window.yql
@@ -91,8 +91,8 @@
 # list_type:type init:lambda
 # doesn't support optional values
 (let count_traits_factory (lambda '(list_type init) (block '(
-  (let update (lambda '(value state) (AggrAdd state (Apply init value))))
-  (let shift (lambda '(value state) (AggrAdd state (Minus (Apply init value)))))
+  (let update (lambda '(value state) (+ state (Apply init value))))
+  (let shift (lambda '(value state) (+ state (Minus (Apply init value)))))
   (let current (lambda '(state) state))
   (return (WindowTraits (ListItemType list_type) init update shift current (Uint64 '0)))
 ))))
@@ -118,7 +118,7 @@
   (let convert_interval_to_decimal (lambda '(value) (StrictCast (StrictCast value (DataType 'Int64)) (DataType 'Decimal '35 '0))))
   (let convert_decimal_to_interval (lambda '(value) (Unwrap (StrictCast (StrictCast value (DataType 'Int64)) (DataType 'Interval)))))
   (let init (lambda '(value) '((MatchType (TypeOf value) 'Decimal (lambda '() (WidenIntegral value)) 'Interval (lambda '() (Apply convert_interval_to_decimal value )) (lambda '() (Convert value 'Double))) (Uint64 '1))))
-  (let update (lambda '(value state) '((AggrAdd (Nth state '0) (MatchType (TypeOf value) 'Decimal (lambda '() (WidenIntegral value)) 'Interval (lambda '() (Apply convert_interval_to_decimal value )) (lambda '() (Convert value 'Double)))) (Inc (Nth state '1)))))
+  (let update (lambda '(value state) '((+ (Nth state '0) (MatchType (TypeOf value) 'Decimal (lambda '() (WidenIntegral value)) 'Interval (lambda '() (Apply convert_interval_to_decimal value )) (lambda '() (Convert value 'Double)))) (Inc (Nth state '1)))))
   (let shift (lambda '(value state) '((- (Nth state '0) value) (Dec (Nth state '1)))))
   (let current (lambda '(state) (MatchType (ListItemType list_type)
                                            'Decimal (lambda '() (Cast (Div (Nth state '0) (Nth state '1)) (ListItemType list_type)))
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan
index 1370b00ffd0..742eb7c912a 100644
--- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan
+++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan
@@ -91,16 +91,9 @@
                                 "Operators": [
                                     {
                                         "Name": "Aggregate"
-                                    },
-                                    {
-                                        "Name": "Limit",
-                                        "Limit": "1"
-                                    },
-                                    {
-                                        "Name": "Aggregate"
                                     }
                                 ],
-                                "Node Type": "Aggregate-Limit-Aggregate"
+                                "Node Type": "Aggregate"
                             }
                         ],
                         "Node Type": "ResultSet",
@@ -196,16 +189,9 @@
                                 "Operators": [
                                     {
                                         "Name": "Aggregate"
-                                    },
-                                    {
-                                        "Name": "Limit",
-                                        "Limit": "1"
-                                    },
-                                    {
-                                        "Name": "Aggregate"
                                     }
                                 ],
-                                "Node Type": "Aggregate-Limit-Aggregate"
+                                "Node Type": "Aggregate"
                             }
                         ],
                         "Node Type": "Precompute_0",
@@ -270,16 +256,9 @@
                                 "Operators": [
                                     {
                                         "Name": "Aggregate"
-                                    },
-                                    {
-                                        "Name": "Limit",
-                                        "Limit": "1"
-                                    },
-                                    {
-                                        "Name": "Aggregate"
                                     }
                                 ],
-                                "Node Type": "Aggregate-Limit-Aggregate"
+                                "Node Type": "Aggregate"
                             }
                         ],
                         "Node Type": "ResultSet",
@@ -375,16 +354,9 @@
                                 "Operators": [
                                     {
                                         "Name": "Aggregate"
-                                    },
-                                    {
-                                        "Name": "Limit",
-                                        "Limit": "1"
-                                    },
-                                    {
-                                        "Name": "Aggregate"
                                     }
                                 ],
-                                "Node Type": "Aggregate-Limit-Aggregate"
+                                "Node Type": "Aggregate"
                             }
                         ],
                         "Node Type": "Precompute_0",
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan
index a43b3553c7b..115975769b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\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\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-Filter-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Nth.unique2 == 42\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"unique2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\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                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRanges\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"unique2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRanges\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\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_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"unique2\"\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\":12,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":11,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":10,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-Filter-FullJoin (JoinDict)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Nth.unique2 == 42\"\n                                  },\n                                  {\n                                    \"Name\":\"FullJoin (JoinDict)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":9,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"unique2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\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                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRanges\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"unique2\"\n                                      ],\n                                    \"Node Type\":\"HashShuffle\",\n                                    \"PlanNodeId\":8,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":7,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":6,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"unique2\"\n                                                              ],\n                                                            \"ReadRanges\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":5,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\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-jointest_join0.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan
index ec8ad7088d2..5c90b38830e 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"fivethous\",\n              \"hundred\",\n              \"thousand\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"fivethous\",\n              \"hundred\",\n              \"thousand\"\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\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.hundred)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Filter-TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(items2) And items0 % 10 \\u003C 10\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"fivethous\",\n                                                                \"hundred\",\n                                                                \"thousand\"\n                                                              ],\n                                                            \"ReadRanges\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"fivethous\",\n                                                    \"hundred\",\n                                                    \"thousand\"\n                                                  ],\n                                                \"ReadRanges\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\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_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"fivethous\",\n              \"hundred\",\n              \"thousand\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"fivethous\",\n              \"hundred\",\n              \"thousand\"\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\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":9,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":8,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-InnerJoin (MapJoin)-Filter\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"InnerJoin (MapJoin)\"\n                                  },\n                                  {\n                                    \"Name\":\"Filter\",\n                                    \"Predicate\":\"Exist(item.hundred)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":7,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":4,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":3,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":2,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"Filter-TableFullScan\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(items2) And items0 % 10 \\u003C 10\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"TableFullScan\",\n                                                            \"ReadColumns\":\n                                                              [\n                                                                \"fivethous\",\n                                                                \"hundred\",\n                                                                \"thousand\"\n                                                              ],\n                                                            \"ReadRanges\":\n                                                              [\n                                                                \"unique1 (-\u221e, +\u221e)\",\n                                                                \"unique2 (-\u221e, +\u221e)\"\n                                                              ],\n                                                            \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":1,\n                                                      \"Tables\":\n                                                        [\n                                                          \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":6,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"fivethous\",\n                                                    \"hundred\",\n                                                    \"thousand\"\n                                                  ],\n                                                \"ReadRanges\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":5,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\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-jointest_join0.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan
index f76e545b181..554f492fc12 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"unique1 (1)\"\n            ],\n          \"scan_by\":\n            [\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\"\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\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.thousand)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\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                                                                                        \"hundred\",\n                                                                                        \"ten\",\n                                                                                        \"thousand\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRanges\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"hundred\",\n                                                                            \"ten\",\n                                                                            \"thousand\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRanges\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TablePointLookup\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TablePointLookup\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"hundred\",\n                                                    \"ten\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (1)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\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_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"Lookup\",\n          \"lookup_by\":\n            [\n              \"unique1 (1)\"\n            ],\n          \"scan_by\":\n            [\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\"\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\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.thousand)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\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                                                                                        \"hundred\",\n                                                                                        \"ten\",\n                                                                                        \"thousand\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRanges\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"hundred\",\n                                                                            \"ten\",\n                                                                            \"thousand\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRanges\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TablePointLookup\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TablePointLookup\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"hundred\",\n                                                    \"ten\"\n                                                  ],\n                                                \"ReadRange\":\n                                                  [\n                                                    \"unique1 (1)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\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-jointest_join0.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan
index 7872c41364a..0df861669b6 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\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\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.thousand)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\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                                                                                        \"hundred\",\n                                                                                        \"ten\",\n                                                                                        \"thousand\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRanges\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"hundred\",\n                                                                            \"ten\",\n                                                                            \"thousand\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRanges\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"hundred\",\n                                                    \"ten\",\n                                                    \"thousand\",\n                                                    \"unique2\"\n                                                  ],\n                                                \"ReadRanges\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\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_jointest\\/join0.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\n            ]\n        },\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"hundred\",\n              \"ten\",\n              \"thousand\",\n              \"unique2\"\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\":16,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      }\n                    ],\n                  \"PlanNodeId\":15,\n                  \"Plans\":\n                    [\n                      {\n                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":14,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-LeftJoin (MapJoin)\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"LeftJoin (MapJoin)\"\n                                  }\n                                ],\n                              \"PlanNodeId\":13,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"Node Type\":\"Broadcast\",\n                                    \"PlanNodeId\":10,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"Collect\",\n                                          \"PlanNodeId\":9,\n                                          \"Plans\":\n                                            [\n                                              {\n                                                \"Node Type\":\"UnionAll\",\n                                                \"PlanNodeId\":8,\n                                                \"PlanNodeType\":\"Connection\",\n                                                \"Plans\":\n                                                  [\n                                                    {\n                                                      \"Node Type\":\"InnerJoin (MapJoin)-Filter\",\n                                                      \"Operators\":\n                                                        [\n                                                          {\n                                                            \"Name\":\"InnerJoin (MapJoin)\"\n                                                          },\n                                                          {\n                                                            \"Name\":\"Filter\",\n                                                            \"Predicate\":\"Exist(item.thousand)\"\n                                                          }\n                                                        ],\n                                                      \"PlanNodeId\":7,\n                                                      \"Plans\":\n                                                        [\n                                                          {\n                                                            \"Node Type\":\"Broadcast\",\n                                                            \"PlanNodeId\":4,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"Collect\",\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                                                                                        \"hundred\",\n                                                                                        \"ten\",\n                                                                                        \"thousand\",\n                                                                                        \"unique2\"\n                                                                                      ],\n                                                                                    \"ReadRanges\":\n                                                                                      [\n                                                                                        \"unique1 (-\u221e, +\u221e)\",\n                                                                                        \"unique2 (-\u221e, +\u221e)\"\n                                                                                      ],\n                                                                                    \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                  }\n                                                                                ],\n                                                                              \"PlanNodeId\":1,\n                                                                              \"Tables\":\n                                                                                [\n                                                                                  \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                                ]\n                                                                            }\n                                                                          ]\n                                                                      }\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          },\n                                                          {\n                                                            \"Node Type\":\"Map\",\n                                                            \"PlanNodeId\":6,\n                                                            \"PlanNodeType\":\"Connection\",\n                                                            \"Plans\":\n                                                              [\n                                                                {\n                                                                  \"Node Type\":\"TableFullScan\",\n                                                                  \"Operators\":\n                                                                    [\n                                                                      {\n                                                                        \"Name\":\"TableFullScan\",\n                                                                        \"ReadColumns\":\n                                                                          [\n                                                                            \"hundred\",\n                                                                            \"ten\",\n                                                                            \"thousand\",\n                                                                            \"unique2\"\n                                                                          ],\n                                                                        \"ReadRanges\":\n                                                                          [\n                                                                            \"unique1 (-\u221e, +\u221e)\",\n                                                                            \"unique2 (-\u221e, +\u221e)\"\n                                                                          ],\n                                                                        \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                      }\n                                                                    ],\n                                                                  \"PlanNodeId\":5,\n                                                                  \"Tables\":\n                                                                    [\n                                                                      \"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                                                    ]\n                                                                }\n                                                              ]\n                                                          }\n                                                        ]\n                                                    }\n                                                  ]\n                                              }\n                                            ]\n                                        }\n                                      ]\n                                  },\n                                  {\n                                    \"Node Type\":\"Map\",\n                                    \"PlanNodeId\":12,\n                                    \"PlanNodeType\":\"Connection\",\n                                    \"Plans\":\n                                      [\n                                        {\n                                          \"Node Type\":\"TableFullScan\",\n                                          \"Operators\":\n                                            [\n                                              {\n                                                \"Name\":\"TableFullScan\",\n                                                \"ReadColumns\":\n                                                  [\n                                                    \"hundred\",\n                                                    \"ten\",\n                                                    \"thousand\",\n                                                    \"unique2\"\n                                                  ],\n                                                \"ReadRanges\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_jointest\\/join0.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":11,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_jointest\\/join0.test_plan\\/tenk1\"\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-select_distinct.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan
index ce69a313de9..de37a69c85d 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/postgres_select_distinct.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"four\",\n              \"two\"\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\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\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-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"four\",\n                                        \"two\"\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                                                    \"four\",\n                                                    \"two\"\n                                                  ],\n                                                \"ReadRanges\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/tenk1\"\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_select_distinct.test_plan\\/tenk1\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"unique1 (-\u221e, +\u221e)\",\n              \"unique2 (-\u221e, +\u221e)\"\n            ],\n          \"columns\":\n            [\n              \"four\",\n              \"two\"\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\":\"Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\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-Aggregate\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  }\n                                ],\n                              \"PlanNodeId\":3,\n                              \"Plans\":\n                                [\n                                  {\n                                    \"KeyColumns\":\n                                      [\n                                        \"four\",\n                                        \"two\"\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                                                    \"four\",\n                                                    \"two\"\n                                                  ],\n                                                \"ReadRanges\":\n                                                  [\n                                                    \"unique1 (-\u221e, +\u221e)\",\n                                                    \"unique2 (-\u221e, +\u221e)\"\n                                                  ],\n                                                \"Table\":\"postgres_select_distinct.test_plan\\/tenk1\"\n                                              }\n                                            ],\n                                          \"PlanNodeId\":1,\n                                          \"Tables\":\n                                            [\n                                              \"postgres_select_distinct.test_plan\\/tenk1\"\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_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan
index 311438db9c9..f1e7d296150 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\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\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\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\":\"Aggregate-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":null,\n                                    \"ReadRanges\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\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\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\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\":4,\n            \"PlanNodeType\":\"ResultSet\",\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                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":null,\n                                    \"ReadRanges\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\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_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan
index 311438db9c9..f1e7d296150 100644
--- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan
+++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan
@@ -1 +1 @@
-"{\n  \"meta\":\n    {\n      \"version\":\"0.2\",\n      \"type\":\"query\"\n    },\n  \"tables\":[\n  {\n    \"name\":\"\\/Root\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\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\":4,\n            \"PlanNodeType\":\"ResultSet\",\n            \"Plans\":\n              [\n                {\n                  \"Node Type\":\"Aggregate-Limit-Aggregate\",\n                  \"Operators\":\n                    [\n                      {\n                        \"Name\":\"Aggregate\"\n                      },\n                      {\n                        \"Limit\":\"1\",\n                        \"Name\":\"Limit\"\n                      },\n                      {\n                        \"Name\":\"Aggregate\"\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\":\"Aggregate-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":null,\n                                    \"ReadRanges\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\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\\/sqllogictest_insert.test_plan\\/a2\",\n    \"reads\":\n      [\n        {\n          \"type\":\"FullScan\",\n          \"scan_by\":\n            [\n              \"a (-\u221e, +\u221e)\",\n              \"b (-\u221e, +\u221e)\",\n              \"c (-\u221e, +\u221e)\"\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\":4,\n            \"PlanNodeType\":\"ResultSet\",\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                        \"Node Type\":\"UnionAll\",\n                        \"PlanNodeId\":2,\n                        \"PlanNodeType\":\"Connection\",\n                        \"Plans\":\n                          [\n                            {\n                              \"Node Type\":\"Aggregate-TableFullScan\",\n                              \"Operators\":\n                                [\n                                  {\n                                    \"Name\":\"Aggregate\"\n                                  },\n                                  {\n                                    \"Name\":\"TableFullScan\",\n                                    \"ReadColumns\":null,\n                                    \"ReadRanges\":\n                                      [\n                                        \"a (-\u221e, +\u221e)\",\n                                        \"b (-\u221e, +\u221e)\",\n                                        \"c (-\u221e, +\u221e)\"\n                                      ],\n                                    \"Table\":\"sqllogictest_insert.test_plan\\/a2\"\n                                  }\n                                ],\n                              \"PlanNodeId\":1,\n                              \"Tables\":\n                                [\n                                  \"sqllogictest_insert.test_plan\\/a2\"\n                                ]\n                            }\n                          ]\n                      }\n                    ]\n                }\n              ]\n          }\n        ]\n    }\n}"
\ No newline at end of file