diff options
author | gvit <gvit@ydb.tech> | 2023-02-16 20:16:53 +0300 |
---|---|---|
committer | gvit <gvit@ydb.tech> | 2023-02-16 20:16:53 +0300 |
commit | ec75c3fc29c5558867383e81c930b39dcddf3836 (patch) | |
tree | da2a5f7625304d8874a134f9f72f76485bb15b9c | |
parent | 4a4927beabd23973b39af57c0abc1255e14b4265 (diff) | |
download | ydb-ec75c3fc29c5558867383e81c930b39dcddf3836.tar.gz |
fix test: add missed order by in query
15 files changed, 206 insertions, 198 deletions
diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan index 4ecfb611bb..22b030c73c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan @@ -19,17 +19,18 @@ "PlanNodeId": 11, "Plans": [ { - "Node Type": "UnionAll", + "Node Type": "Merge", "PlanNodeId": 10, "PlanNodeType": "Connection", "Plans": [ { "CTE Name": "tx_result_binding_2_0", - "Node Type": "Limit-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr", + "Node Type": "TopSort-InnerJoin (MapJoin)-Filter-TablePointLookup-ConstantExpr", "Operators": [ { "Limit": "1001", - "Name": "Limit" + "Name": "TopSort", + "TopSortBy": "" }, { "Name": "InnerJoin (MapJoin)" @@ -56,6 +57,12 @@ "postgres_jointest/join1.test_plan/J2_TBL" ] } + ], + "SortColumns": [ + "i (Asc)", + "j (Asc)", + "t (Asc)", + "k (Asc)" ] } ] diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_10 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_10 index d6e02d3c05..a8195cbb64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_10 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_10 @@ -2,49 +2,49 @@ { "i": null, "j": null, - "t": null, - "k": null + "k": null, + "t": null }, { "i": null, "j": null, - "t": null, - "k": 0 + "k": 0, + "t": null }, { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_11 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_11 index 49597601b9..f75c13460a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_11 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_11 @@ -2,85 +2,85 @@ { "i": null, "j": null, - "t": null, - "k": null + "k": null, + "t": null }, { "i": null, "j": null, - "t": "null", - "k": null + "k": null, + "t": "null" }, { "i": null, "j": 0, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": null, "j": null, - "t": null, - "k": 0 + "k": 0, + "t": null }, { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 4, "j": 1, - "t": "four", - "k": null + "k": null, + "t": "four" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" }, { "i": 6, "j": 6, - "t": "six", - "k": null + "k": null, + "t": "six" }, { "i": 7, "j": 7, - "t": "seven", - "k": null + "k": null, + "t": "seven" }, { "i": 8, "j": 8, - "t": "eight", - "k": null + "k": null, + "t": "eight" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_12 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_12 index 49597601b9..f75c13460a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_12 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_12 @@ -2,85 +2,85 @@ { "i": null, "j": null, - "t": null, - "k": null + "k": null, + "t": null }, { "i": null, "j": null, - "t": "null", - "k": null + "k": null, + "t": "null" }, { "i": null, "j": 0, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": null, "j": null, - "t": null, - "k": 0 + "k": 0, + "t": null }, { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 4, "j": 1, - "t": "four", - "k": null + "k": null, + "t": "four" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" }, { "i": 6, "j": 6, - "t": "six", - "k": null + "k": null, + "t": "six" }, { "i": 7, "j": 7, - "t": "seven", - "k": null + "k": null, + "t": "seven" }, { "i": 8, "j": 8, - "t": "eight", - "k": null + "k": null, + "t": "eight" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_14 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_14 index 85902015f9..6018fc3537 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_14 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_14 @@ -2,7 +2,7 @@ { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_2 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_2 index 576df265fd..0ebdd18827 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_2 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_2 @@ -2,37 +2,37 @@ { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_3 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_3 index 576df265fd..0ebdd18827 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_3 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_3 @@ -2,37 +2,37 @@ { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_4 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_4 index 93bbd39a43..2c49b8f6d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_4 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_4 @@ -1,26 +1,26 @@ [ { - "b": 0, "a": null, - "c": "zero", - "a2": null + "a2": null, + "b": 0, + "c": "zero" }, { - "b": 0, "a": 5, - "c": "five", - "a2": null + "a2": null, + "b": 0, + "c": "five" }, { - "b": 2, "a": 3, - "c": "three", - "a2": 2 + "a2": 2, + "b": 2, + "c": "three" }, { - "b": 4, "a": 1, - "c": "one", - "a2": 2 + "a2": 2, + "b": 4, + "c": "one" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_5 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_5 index 576df265fd..0ebdd18827 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_5 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_5 @@ -2,37 +2,37 @@ { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_6 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_6 index 8174a93f33..6136b18e1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_6 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_6 @@ -2,19 +2,19 @@ { "i": 0, "j": null, - "t": "zero", - "k": 0 + "k": 0, + "t": "zero" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 4, "j": 1, - "t": "four", - "k": 4 + "k": 4, + "t": "four" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_7 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_7 index f6aebd4899..0cd851ac0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_7 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_7 @@ -2,73 +2,73 @@ { "i": null, "j": null, - "t": "null", - "k": null + "k": null, + "t": "null" }, { "i": null, "j": 0, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 4, "j": 1, - "t": "four", - "k": null + "k": null, + "t": "four" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" }, { "i": 6, "j": 6, - "t": "six", - "k": null + "k": null, + "t": "six" }, { "i": 7, "j": 7, - "t": "seven", - "k": null + "k": null, + "t": "seven" }, { "i": 8, "j": 8, - "t": "eight", - "k": null + "k": null, + "t": "eight" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_8 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_8 index f6aebd4899..0cd851ac0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_8 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_8 @@ -2,73 +2,73 @@ { "i": null, "j": null, - "t": "null", - "k": null + "k": null, + "t": "null" }, { "i": null, "j": 0, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 4, "j": 1, - "t": "four", - "k": null + "k": null, + "t": "four" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" }, { "i": 6, "j": 6, - "t": "six", - "k": null + "k": null, + "t": "six" }, { "i": 7, "j": 7, - "t": "seven", - "k": null + "k": null, + "t": "seven" }, { "i": 8, "j": 8, - "t": "eight", - "k": null + "k": null, + "t": "eight" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_9 b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_9 index d6e02d3c05..a8195cbb64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_9 +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_results-jointest_join1.test_/query_9 @@ -2,49 +2,49 @@ { "i": null, "j": null, - "t": null, - "k": null + "k": null, + "t": null }, { "i": null, "j": null, - "t": null, - "k": 0 + "k": 0, + "t": null }, { "i": 0, "j": null, - "t": "zero", - "k": null + "k": null, + "t": "zero" }, { "i": 1, "j": 4, - "t": "one", - "k": -1 + "k": -1, + "t": "one" }, { "i": 2, "j": 3, - "t": "two", - "k": 2 + "k": 2, + "t": "two" }, { "i": 2, "j": 3, - "t": "two", - "k": 4 + "k": 4, + "t": "two" }, { "i": 3, "j": 2, - "t": "three", - "k": -3 + "k": -3, + "t": "three" }, { "i": 5, "j": 0, - "t": "five", - "k": -5 + "k": -5, + "t": "five" } ]
\ No newline at end of file diff --git a/ydb/tests/functional/suite_tests/postgres/jointest/join1.test b/ydb/tests/functional/suite_tests/postgres/jointest/join1.test index ad72b8fd67..b0cf75f769 100644 --- a/ydb/tests/functional/suite_tests/postgres/jointest/join1.test +++ b/ydb/tests/functional/suite_tests/postgres/jointest/join1.test @@ -176,7 +176,8 @@ SELECT '' AS "xxx", * statement query SELECT J1_TBL.i as i, j, t, k - FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i = J2_TBL.i); + FROM J1_TBL JOIN J2_TBL ON (J1_TBL.i = J2_TBL.i) +ORDER BY i, j, t, k; statement query SELECT J1_TBL.i as i, j, t, k diff --git a/ydb/tests/functional/suite_tests/test_base.py b/ydb/tests/functional/suite_tests/test_base.py index 08f9974bd3..cdb571ce2a 100644 --- a/ydb/tests/functional/suite_tests/test_base.py +++ b/ydb/tests/functional/suite_tests/test_base.py @@ -31,8 +31,8 @@ def mute_sdk_loggers(): 'ydb.resolver.DiscoveryEndpointsResolver' ) - for l in loggers: - li = logging.getLogger(l) + for logger_name in loggers: + li = logging.getLogger(logger_name) li.setLevel(logging.CRITICAL) |