aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidar Samerkhanov <aidarsamer@ydb.tech>2024-01-10 12:55:18 +0300
committerGitHub <noreply@github.com>2024-01-10 12:55:18 +0300
commit9a778e02004dd03e9f28e7454608812a3d1dc5d2 (patch)
tree0ad8e8e6a1e2a2f33d4c31568f273c0c5e94e1d8
parentea061ca74b256c1a013dc9bbe359a30ea8251b79 (diff)
downloadydb-9a778e02004dd03e9f28e7454608812a3d1dc5d2.tar.gz
YQL-17391: Make inmem_with_set_key* tests results deterministic (#880)
-rw-r--r--ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json6
-rw-r--r--ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json6
-rw-r--r--ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json12
-rw-r--r--ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json12
-rw-r--r--ydb/library/yql/tests/sql/sql2yql/canondata/result.json24
-rw-r--r--ydb/library/yql/tests/sql/suites/join/inmem_with_set_key.sql7
-rw-r--r--ydb/library/yql/tests/sql/suites/join/inmem_with_set_key_any.sql7
-rw-r--r--ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json12
-rw-r--r--ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json12
9 files changed, 54 insertions, 44 deletions
diff --git a/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
index 70ccc7cacb..134ebea71c 100644
--- a/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
@@ -1154,9 +1154,9 @@
],
"test.test[join-inmem_with_set_key--Debug]": [
{
- "checksum": "73d32db9cb5d3ec7c8893434222b161a",
- "size": 1732,
- "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql_patched"
+ "checksum": "03bb67f80e6481983e9d9bca5694551c",
+ "size": 2778,
+ "uri": "https://{canondata_backend}/1903885/71ee43a73f62c943cd2c83ad3cb710bb8b1d9fb0/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql_patched"
}
],
"test.test[join-inmem_with_set_key--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
index 14d8c797b9..d383546c4c 100644
--- a/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
@@ -1282,9 +1282,9 @@
],
"test.test[join-inmem_with_set_key_any--Debug]": [
{
- "checksum": "f358a04c22f3bbdb6284c9ee2bb7992e",
- "size": 1791,
- "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql_patched"
+ "checksum": "0edaf3acbdc3244f85b9ce47868fac9b",
+ "size": 2837,
+ "uri": "https://{canondata_backend}/1903885/6dbb180a1fb0bec551465ca4925bd6f374b599c7/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql_patched"
}
],
"test.test[join-inmem_with_set_key_any--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
index 9e89b15f02..3d51e1a6a0 100644
--- a/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json
@@ -1076,9 +1076,9 @@
],
"test.test[join-inmem_with_set_key-off-Debug]": [
{
- "checksum": "f7431c01114df60519aa24ac3c7170c5",
- "size": 1818,
- "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-inmem_with_set_key-off-Debug_/opt.yql_patched"
+ "checksum": "f4e50dfd60d3171766116f0e833705b3",
+ "size": 2864,
+ "uri": "https://{canondata_backend}/1903885/e665e50194f0fdfa8d7857ead4c5d407752c80c8/resource.tar.gz#test.test_join-inmem_with_set_key-off-Debug_/opt.yql_patched"
}
],
"test.test[join-inmem_with_set_key-off-Plan]": [
@@ -1090,9 +1090,9 @@
],
"test.test[join-inmem_with_set_key-off-Results]": [
{
- "checksum": "ecdf59099c26758b7bb4106e07e05e5d",
- "size": 2267,
- "uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-inmem_with_set_key-off-Results_/results.txt"
+ "checksum": "73023e03156864313c60bfccfd192a88",
+ "size": 2331,
+ "uri": "https://{canondata_backend}/1903885/e665e50194f0fdfa8d7857ead4c5d407752c80c8/resource.tar.gz#test.test_join-inmem_with_set_key-off-Results_/results.txt"
}
],
"test.test[join-inner_grouped_by_expr--Analyze]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
index 0e0f6c97c1..2a95c6e15e 100644
--- a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
@@ -1033,9 +1033,9 @@
],
"test.test[join-inmem_with_set_key_any-off-Debug]": [
{
- "checksum": "108e71b345a5dbd62d42a9936f758e9e",
- "size": 1877,
- "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Debug_/opt.yql_patched"
+ "checksum": "c2de537418fc84da5cdfe9500c5fbc70",
+ "size": 2923,
+ "uri": "https://{canondata_backend}/1937492/3cc712c3196f7027398ddcbbf6597f57ccd7dfeb/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Debug_/opt.yql_patched"
}
],
"test.test[join-inmem_with_set_key_any-off-Plan]": [
@@ -1047,9 +1047,9 @@
],
"test.test[join-inmem_with_set_key_any-off-Results]": [
{
- "checksum": "34b5409f9fb03a14e181cac68fd98576",
- "size": 766,
- "uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Results_/results.txt"
+ "checksum": "0582e4d9579caca2aff4bb94c2dda229",
+ "size": 830,
+ "uri": "https://{canondata_backend}/1937492/3cc712c3196f7027398ddcbbf6597f57ccd7dfeb/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Results_/results.txt"
}
],
"test.test[join-inner_trivial--Analyze]": [
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index 8af58a8c9c..4dac634501 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -7372,16 +7372,16 @@
],
"test_sql2yql.test[join-inmem_with_set_key]": [
{
- "checksum": "1f01980606f9f7593a2eafd8986a411e",
- "size": 2486,
- "uri": "https://{canondata_backend}/1937027/b5576dd03b65095c35e7cb4954821e4f66817b94/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_/sql.yql"
+ "checksum": "3ccabe5b0575cafb48b98dd6a72cac78",
+ "size": 4725,
+ "uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_/sql.yql"
}
],
"test_sql2yql.test[join-inmem_with_set_key_any]": [
{
- "checksum": "75447470e50bc55ae4670d95950b58a6",
- "size": 2542,
- "uri": "https://{canondata_backend}/1937027/b5576dd03b65095c35e7cb4954821e4f66817b94/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_any_/sql.yql"
+ "checksum": "08586e0491006133758dbdcd93ed71bf",
+ "size": 4781,
+ "uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_any_/sql.yql"
}
],
"test_sql2yql.test[join-inner_all]": [
@@ -24690,16 +24690,16 @@
],
"test_sql_format.test[join-inmem_with_set_key]": [
{
- "checksum": "250a8dcd468125a7334d95bf1d96f928",
- "size": 738,
- "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_/formatted.sql"
+ "checksum": "9fc8b32523e8ce97343d515e11bd4633",
+ "size": 1035,
+ "uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_/formatted.sql"
}
],
"test_sql_format.test[join-inmem_with_set_key_any]": [
{
- "checksum": "9442a259dafd5fa6d410b9709ca78bb4",
- "size": 754,
- "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql"
+ "checksum": "23792c7c0533b85348359838bfc719c1",
+ "size": 1051,
+ "uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql"
}
],
"test_sql_format.test[join-inner_all]": [
diff --git a/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key.sql b/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key.sql
index eeb7bf3e06..8ac235b3df 100644
--- a/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key.sql
+++ b/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key.sql
@@ -6,7 +6,11 @@ $two = [<|'c':{Just("1")}, 'd':2|>, <|'c':{}, 'd':3|>, <|'c':null, 'd':4|>, <|'c
$foo = [<|'e':{"1"u}, 'f':-2|>, <|'e':{"1"u,"2"u}, 'f':-3|>, <|'e':null, 'f':-4|>, <|'e':{"1"u}, 'f':-9|>];
$bar = [<|'g':{Just("1"u)}, 'h':1.|>, <|'g':{}, 'h':2.2|>, <|'g':{Just("1"u),Just("2"u)}, 'h':3.3|>, <|'g':{Just("1"u)}, 'h':4.4|>];
-SELECT *
+SELECT
+ListSort(DictItems(bar.g)) as bar_g, bar.h,
+ListSort(DictItems(foo.e)) as foo_e, foo.f,
+ListSort(DictItems(one.a)) as one_a, one.b,
+ListSort(DictItems(two.c)) as two_c, two.d
FROM AS_TABLE($one) AS one
INNER JOIN AS_TABLE($two) AS two
ON one.a == two.c
@@ -14,3 +18,4 @@ LEFT JOIN AS_TABLE($foo) AS foo
ON foo.e == two.c
FULL JOIN AS_TABLE($bar) AS bar
ON bar.g == one.a
+ORDER BY bar_g, bar.h, foo_e, foo.f, one_a, one.b, two_c, two.d
diff --git a/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key_any.sql b/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key_any.sql
index 1a72639ae8..fc7d7be5c0 100644
--- a/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key_any.sql
+++ b/ydb/library/yql/tests/sql/suites/join/inmem_with_set_key_any.sql
@@ -6,7 +6,11 @@ $two = [<|'c':{Just("1")}, 'd':2|>, <|'c':{}, 'd':3|>, <|'c':null, 'd':4|>, <|'c
$foo = [<|'e':{"1"u}, 'f':-2|>, <|'e':{"1"u,"2"u}, 'f':-3|>, <|'e':null, 'f':-4|>, <|'e':{"1"u}, 'f':-9|>];
$bar = [<|'g':{Just("1"u)}, 'h':1.|>, <|'g':{}, 'h':2.2|>, <|'g':{Just("1"u),Just("2"u)}, 'h':3.3|>, <|'g':{Just("1"u)}, 'h':4.4|>];
-SELECT *
+SELECT
+ListSort(DictItems(bar.g)) as bar_g, bar.h,
+ListSort(DictItems(foo.e)) as foo_e, foo.f,
+ListSort(DictItems(one.a)) as one_a, one.b,
+ListSort(DictItems(two.c)) as two_c, two.d
FROM ANY AS_TABLE($one) AS one
INNER JOIN ANY AS_TABLE($two) AS two
ON one.a == two.c
@@ -14,3 +18,4 @@ LEFT JOIN ANY AS_TABLE($foo) AS foo
ON foo.e == two.c
FULL JOIN ANY AS_TABLE($bar) AS bar
ON bar.g == one.a
+ORDER BY bar_g, bar.h, foo_e, foo.f, one_a, one.b, two_c, two.d
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
index 524bcbc36a..1bbcedf376 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
@@ -1037,9 +1037,9 @@
],
"test.test[join-inmem_with_set_key--Debug]": [
{
- "checksum": "a19c40afb1dc194764cb7af5cc15bf5d",
- "size": 1661,
- "uri": "https://{canondata_backend}/1937027/642fd2ff53bdb0fed32ca89598d70c9c5848ac20/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql"
+ "checksum": "87b1c4d78a0fc1cd034e00a2172a9779",
+ "size": 2707,
+ "uri": "https://{canondata_backend}/1814674/7b038fc802b56e98636f586bc8bf457d63ec69b9/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql"
}
],
"test.test[join-inmem_with_set_key--Plan]": [
@@ -1051,9 +1051,9 @@
],
"test.test[join-inmem_with_set_key--Results]": [
{
- "checksum": "23c66334b365b45719fb256537cbf694",
- "size": 31913,
- "uri": "https://{canondata_backend}/1937027/642fd2ff53bdb0fed32ca89598d70c9c5848ac20/resource.tar.gz#test.test_join-inmem_with_set_key--Results_/results.txt"
+ "checksum": "c6968036537e881bf0f50a0ee3004573",
+ "size": 33117,
+ "uri": "https://{canondata_backend}/1814674/7b038fc802b56e98636f586bc8bf457d63ec69b9/resource.tar.gz#test.test_join-inmem_with_set_key--Results_/results.txt"
}
],
"test.test[join-inner_all_right--Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
index 51ce8f4408..14c687eb64 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
@@ -1211,9 +1211,9 @@
],
"test.test[join-inmem_with_set_key_any--Debug]": [
{
- "checksum": "cf6e0ef8b42b11747615e9471528801b",
- "size": 1720,
- "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql"
+ "checksum": "0fc6001fb0b21cf98772fa765a580630",
+ "size": 2766,
+ "uri": "https://{canondata_backend}/1937492/ba27d5b67f2650fd062c69f5d0d46bec1338a05c/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql"
}
],
"test.test[join-inmem_with_set_key_any--Plan]": [
@@ -1225,9 +1225,9 @@
],
"test.test[join-inmem_with_set_key_any--Results]": [
{
- "checksum": "02aac88d89f6306620cf48b1a339da0f",
- "size": 7822,
- "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-inmem_with_set_key_any--Results_/results.txt"
+ "checksum": "64d1f142a4fb5bd322f49c6f08435f3e",
+ "size": 9026,
+ "uri": "https://{canondata_backend}/1937492/ba27d5b67f2650fd062c69f5d0d46bec1338a05c/resource.tar.gz#test.test_join-inmem_with_set_key_any--Results_/results.txt"
}
],
"test.test[join-lookupjoin_inner--Debug]": [