canonize tests, fix flake8 error

6 files changed, 27 insertions, 27 deletions

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 c23db58731c..258b026e8f7 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
@@ -155,7 +155,7 @@
                                 "Node Type": "Aggregate"
                             }
                         ],
-                        "Node Type": "Precompute_0_0",
+                        "Node Type": "Precompute_0",
                         "Parent Relationship": "InitPlan"
                     },
                     {
@@ -186,7 +186,7 @@
                                 "Node Type": "Collect"
                             }
                         ],
-                        "Node Type": "ResultSet_1_0",
+                        "Node Type": "ResultSet_1",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
@@ -229,7 +229,7 @@
                                                         "Name": "Aggregate"
                                                     },
                                                     {
-                                                        "ReadRange": [
+                                                        "ReadRanges": [
                                                             "Key (-\u221e, +\u221e)"
                                                         ],
                                                         "ReadColumns": null,
@@ -252,7 +252,7 @@
                                 "Node Type": "Aggregate"
                             }
                         ],
-                        "Node Type": "ResultSet_0_0",
+                        "Node Type": "ResultSet",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
@@ -319,7 +319,7 @@
                                 "Node Type": "Aggregate"
                             }
                         ],
-                        "Node Type": "Precompute_0_0",
+                        "Node Type": "Precompute_0",
                         "Parent Relationship": "InitPlan"
                     },
                     {
@@ -350,7 +350,7 @@
                                 "Node Type": "Collect"
                             }
                         ],
-                        "Node Type": "ResultSet_1_0",
+                        "Node Type": "ResultSet_1",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
@@ -393,7 +393,7 @@
                                                         "Name": "Aggregate"
                                                     },
                                                     {
-                                                        "ReadRange": [
+                                                        "ReadRanges": [
                                                             "Key (-\u221e, +\u221e)"
                                                         ],
                                                         "ReadColumns": null,
@@ -416,7 +416,7 @@
                                 "Node Type": "Aggregate"
                             }
                         ],
-                        "Node Type": "ResultSet_0_0",
+                        "Node Type": "ResultSet",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
@@ -442,7 +442,7 @@
                                 "Node Type": "ConstantExpr"
                             }
                         ],
-                        "Node Type": "ResultSet_0_0",
+                        "Node Type": "ResultSet",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan
index c3163807241..ac3c5c28a93 100644
--- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan
+++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan
@@ -105,7 +105,7 @@
                                                                 "PlanNodeId": 1,
                                                                 "Operators": [
                                                                     {
-                                                                        "ReadRange": [
+                                                                        "ReadRanges": [
                                                                             "Group (-\u221e, +\u221e)",
                                                                             "Name (-\u221e, +\u221e)"
                                                                         ],
@@ -141,7 +141,7 @@
                                 "Node Type": "Collect"
                             }
                         ],
-                        "Node Type": "Precompute_0_0",
+                        "Node Type": "Precompute_0",
                         "Parent Relationship": "InitPlan"
                     },
                     {
@@ -163,7 +163,7 @@
                                 "Node Type": "Filter-Limit"
                             }
                         ],
-                        "Node Type": "Precompute_1_0",
+                        "Node Type": "Precompute_1",
                         "Parent Relationship": "InitPlan"
                     },
                     {
@@ -274,7 +274,7 @@
                                 "Node Type": "Limit"
                             }
                         ],
-                        "Node Type": "ResultSet_2_0",
+                        "Node Type": "ResultSet_2",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan
index ba41a09b24b..74d18b731ea 100644
--- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan
+++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage.script-script_/write_multi_usage.script.plan
@@ -209,10 +209,10 @@
                                                         "Limit": "1001"
                                                     },
                                                     {
-                                                        "ReadRange": [
+                                                        "ReadLimit": "1001",
+                                                        "ReadRanges": [
                                                             "Name (-\u221e, +\u221e)"
                                                         ],
-                                                        "ReadLimit": "1001",
                                                         "ReadColumns": [
                                                             "Name",
                                                             "Value"
@@ -240,7 +240,7 @@
                                 "Node Type": "Limit"
                             }
                         ],
-                        "Node Type": "ResultSet_0_0",
+                        "Node Type": "ResultSet_0",
                         "PlanNodeType": "ResultSet"
                     },
                     {
@@ -263,11 +263,11 @@
                                                         "Limit": "1001"
                                                     },
                                                     {
-                                                        "ReadRange": [
+                                                        "ReadLimit": "1001",
+                                                        "ReadRanges": [
                                                             "Group (-\u221e, +\u221e)",
                                                             "Name (-\u221e, +\u221e)"
                                                         ],
-                                                        "ReadLimit": "1001",
                                                         "ReadColumns": [
                                                             "Amount",
                                                             "Comment",
@@ -298,7 +298,7 @@
                                 "Node Type": "Limit"
                             }
                         ],
-                        "Node Type": "ResultSet_0_1",
+                        "Node Type": "ResultSet_1",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan
index aff3a645163..254d3f7b40d 100644
--- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan
+++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_multi_usage_key.script-script_/write_multi_usage_key.script.plan
@@ -58,7 +58,7 @@
                                                         "Name": "Filter"
                                                     },
                                                     {
-                                                        "ReadRange": [
+                                                        "ReadRanges": [
                                                             "Group (-\u221e, +\u221e)",
                                                             "Name (-\u221e, +\u221e)"
                                                         ],
@@ -80,7 +80,7 @@
                                 "Node Type": "Collect"
                             }
                         ],
-                        "Node Type": "Precompute_0_0",
+                        "Node Type": "Precompute_0",
                         "Parent Relationship": "InitPlan"
                     },
                     {
@@ -182,7 +182,7 @@
                                 "Node Type": "Limit"
                             }
                         ],
-                        "Node Type": "ResultSet_0_0",
+                        "Node Type": "ResultSet",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan
index 5d1620156e0..585f72fff1c 100644
--- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan
+++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan
@@ -61,7 +61,7 @@
                                                                 "PlanNodeId": 1,
                                                                 "Operators": [
                                                                     {
-                                                                        "ReadRange": [
+                                                                        "ReadRanges": [
                                                                             "Group (-\u221e, +\u221e)",
                                                                             "Name (-\u221e, +\u221e)"
                                                                         ],
@@ -98,7 +98,7 @@
                                 "Node Type": "Collect"
                             }
                         ],
-                        "Node Type": "Precompute_0_0",
+                        "Node Type": "Precompute_0",
                         "Parent Relationship": "InitPlan"
                     },
                     {
@@ -202,7 +202,7 @@
                                 "Node Type": "Limit"
                             }
                         ],
-                        "Node Type": "ResultSet_0_0",
+                        "Node Type": "ResultSet",
                         "PlanNodeType": "ResultSet"
                     }
                 ],
diff --git a/ydb/tests/functional/canonical/test_sql.py b/ydb/tests/functional/canonical/test_sql.py
index 2f7dda31408..966d8b5c3cf 100644
--- a/ydb/tests/functional/canonical/test_sql.py
+++ b/ydb/tests/functional/canonical/test_sql.py
@@ -27,8 +27,8 @@ def mute_sdk_loggers():
         'ydb.resolver.DiscoveryEndpointsResolver'
     )
 
-    for l in loggers:
-        li = logging.getLogger(l)
+    for logger in loggers:
+        li = logging.getLogger(logger)
         li.setLevel(logging.CRITICAL)