Skip to content

Commit 9a778e0

Browse files
DarychDarych
authored
YQL-17391: Make inmem_with_set_key* tests results deterministic (#880)
1 parent ea061ca commit 9a778e0

File tree

9 files changed

+54
-44
lines changed

9 files changed

+54
-44
lines changed

‎ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1154,9 +1154,9 @@
11541154
],
11551155
"test.test[join-inmem_with_set_key--Debug]": [
11561156
{
1157-
"checksum": "73d32db9cb5d3ec7c8893434222b161a",
1158-
"size": 1732,
1159-
"uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql_patched"
1157+
"checksum": "03bb67f80e6481983e9d9bca5694551c",
1158+
"size": 2778,
1159+
"uri": "https://{canondata_backend}/1903885/71ee43a73f62c943cd2c83ad3cb710bb8b1d9fb0/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql_patched"
11601160
}
11611161
],
11621162
"test.test[join-inmem_with_set_key--Plan]": [

‎ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1282,9 +1282,9 @@
12821282
],
12831283
"test.test[join-inmem_with_set_key_any--Debug]": [
12841284
{
1285-
"checksum": "f358a04c22f3bbdb6284c9ee2bb7992e",
1286-
"size": 1791,
1287-
"uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql_patched"
1285+
"checksum": "0edaf3acbdc3244f85b9ce47868fac9b",
1286+
"size": 2837,
1287+
"uri": "https://{canondata_backend}/1903885/6dbb180a1fb0bec551465ca4925bd6f374b599c7/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql_patched"
12881288
}
12891289
],
12901290
"test.test[join-inmem_with_set_key_any--Plan]": [

‎ydb/library/yql/tests/sql/dq_file/part15/canondata/result.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1076,9 +1076,9 @@
10761076
],
10771077
"test.test[join-inmem_with_set_key-off-Debug]": [
10781078
{
1079-
"checksum": "f7431c01114df60519aa24ac3c7170c5",
1080-
"size": 1818,
1081-
"uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-inmem_with_set_key-off-Debug_/opt.yql_patched"
1079+
"checksum": "f4e50dfd60d3171766116f0e833705b3",
1080+
"size": 2864,
1081+
"uri": "https://{canondata_backend}/1903885/e665e50194f0fdfa8d7857ead4c5d407752c80c8/resource.tar.gz#test.test_join-inmem_with_set_key-off-Debug_/opt.yql_patched"
10821082
}
10831083
],
10841084
"test.test[join-inmem_with_set_key-off-Plan]": [
@@ -1090,9 +1090,9 @@
10901090
],
10911091
"test.test[join-inmem_with_set_key-off-Results]": [
10921092
{
1093-
"checksum": "ecdf59099c26758b7bb4106e07e05e5d",
1094-
"size": 2267,
1095-
"uri": "https://{canondata_backend}/1600758/aad142702907f13e911494c1a7b312bad34f692a/resource.tar.gz#test.test_join-inmem_with_set_key-off-Results_/results.txt"
1093+
"checksum": "73023e03156864313c60bfccfd192a88",
1094+
"size": 2331,
1095+
"uri": "https://{canondata_backend}/1903885/e665e50194f0fdfa8d7857ead4c5d407752c80c8/resource.tar.gz#test.test_join-inmem_with_set_key-off-Results_/results.txt"
10961096
}
10971097
],
10981098
"test.test[join-inner_grouped_by_expr--Analyze]": [

‎ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1033,9 +1033,9 @@
10331033
],
10341034
"test.test[join-inmem_with_set_key_any-off-Debug]": [
10351035
{
1036-
"checksum": "108e71b345a5dbd62d42a9936f758e9e",
1037-
"size": 1877,
1038-
"uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Debug_/opt.yql_patched"
1036+
"checksum": "c2de537418fc84da5cdfe9500c5fbc70",
1037+
"size": 2923,
1038+
"uri": "https://{canondata_backend}/1937492/3cc712c3196f7027398ddcbbf6597f57ccd7dfeb/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Debug_/opt.yql_patched"
10391039
}
10401040
],
10411041
"test.test[join-inmem_with_set_key_any-off-Plan]": [
@@ -1047,9 +1047,9 @@
10471047
],
10481048
"test.test[join-inmem_with_set_key_any-off-Results]": [
10491049
{
1050-
"checksum": "34b5409f9fb03a14e181cac68fd98576",
1051-
"size": 766,
1052-
"uri": "https://{canondata_backend}/1900335/a5a16b7313d07b162a608c1abeab1e68e6175117/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Results_/results.txt"
1050+
"checksum": "0582e4d9579caca2aff4bb94c2dda229",
1051+
"size": 830,
1052+
"uri": "https://{canondata_backend}/1937492/3cc712c3196f7027398ddcbbf6597f57ccd7dfeb/resource.tar.gz#test.test_join-inmem_with_set_key_any-off-Results_/results.txt"
10531053
}
10541054
],
10551055
"test.test[join-inner_trivial--Analyze]": [

‎ydb/library/yql/tests/sql/sql2yql/canondata/result.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -7372,16 +7372,16 @@
73727372
],
73737373
"test_sql2yql.test[join-inmem_with_set_key]": [
73747374
{
7375-
"checksum": "1f01980606f9f7593a2eafd8986a411e",
7376-
"size": 2486,
7377-
"uri": "https://{canondata_backend}/1937027/b5576dd03b65095c35e7cb4954821e4f66817b94/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_/sql.yql"
7375+
"checksum": "3ccabe5b0575cafb48b98dd6a72cac78",
7376+
"size": 4725,
7377+
"uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_/sql.yql"
73787378
}
73797379
],
73807380
"test_sql2yql.test[join-inmem_with_set_key_any]": [
73817381
{
7382-
"checksum": "75447470e50bc55ae4670d95950b58a6",
7383-
"size": 2542,
7384-
"uri": "https://{canondata_backend}/1937027/b5576dd03b65095c35e7cb4954821e4f66817b94/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_any_/sql.yql"
7382+
"checksum": "08586e0491006133758dbdcd93ed71bf",
7383+
"size": 4781,
7384+
"uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_any_/sql.yql"
73857385
}
73867386
],
73877387
"test_sql2yql.test[join-inner_all]": [
@@ -24690,16 +24690,16 @@
2469024690
],
2469124691
"test_sql_format.test[join-inmem_with_set_key]": [
2469224692
{
24693-
"checksum": "250a8dcd468125a7334d95bf1d96f928",
24694-
"size": 738,
24695-
"uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_/formatted.sql"
24693+
"checksum": "9fc8b32523e8ce97343d515e11bd4633",
24694+
"size": 1035,
24695+
"uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_/formatted.sql"
2469624696
}
2469724697
],
2469824698
"test_sql_format.test[join-inmem_with_set_key_any]": [
2469924699
{
24700-
"checksum": "9442a259dafd5fa6d410b9709ca78bb4",
24701-
"size": 754,
24702-
"uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql"
24700+
"checksum": "23792c7c0533b85348359838bfc719c1",
24701+
"size": 1051,
24702+
"uri": "https://{canondata_backend}/1599023/14a33c83ee9ed00bbb41531eba5a0e67835b3ba6/resource.tar.gz#test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql"
2470324703
}
2470424704
],
2470524705
"test_sql_format.test[join-inner_all]": [

‎ydb/library/yql/tests/sql/suites/join/inmem_with_set_key.sql

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ $two = [<|'c':{Just("1")}, 'd':2|>, <|'c':{}, 'd':3|>, <|'c':null, 'd':4|>, <|'c
66
$foo = [<|'e':{"1"u}, 'f':-2|>, <|'e':{"1"u,"2"u}, 'f':-3|>, <|'e':null, 'f':-4|>, <|'e':{"1"u}, 'f':-9|>];
77
$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|>];
88

9-
SELECT *
9+
SELECT
10+
ListSort(DictItems(bar.g)) as bar_g, bar.h,
11+
ListSort(DictItems(foo.e)) as foo_e, foo.f,
12+
ListSort(DictItems(one.a)) as one_a, one.b,
13+
ListSort(DictItems(two.c)) as two_c, two.d
1014
FROM AS_TABLE($one) AS one
1115
INNER JOIN AS_TABLE($two) AS two
1216
ON one.a == two.c
1317
LEFT JOIN AS_TABLE($foo) AS foo
1418
ON foo.e == two.c
1519
FULL JOIN AS_TABLE($bar) AS bar
1620
ON bar.g == one.a
21+
ORDER BY bar_g, bar.h, foo_e, foo.f, one_a, one.b, two_c, two.d

‎ydb/library/yql/tests/sql/suites/join/inmem_with_set_key_any.sql

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ $two = [<|'c':{Just("1")}, 'd':2|>, <|'c':{}, 'd':3|>, <|'c':null, 'd':4|>, <|'c
66
$foo = [<|'e':{"1"u}, 'f':-2|>, <|'e':{"1"u,"2"u}, 'f':-3|>, <|'e':null, 'f':-4|>, <|'e':{"1"u}, 'f':-9|>];
77
$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|>];
88

9-
SELECT *
9+
SELECT
10+
ListSort(DictItems(bar.g)) as bar_g, bar.h,
11+
ListSort(DictItems(foo.e)) as foo_e, foo.f,
12+
ListSort(DictItems(one.a)) as one_a, one.b,
13+
ListSort(DictItems(two.c)) as two_c, two.d
1014
FROM ANY AS_TABLE($one) AS one
1115
INNER JOIN ANY AS_TABLE($two) AS two
1216
ON one.a == two.c
1317
LEFT JOIN ANY AS_TABLE($foo) AS foo
1418
ON foo.e == two.c
1519
FULL JOIN ANY AS_TABLE($bar) AS bar
1620
ON bar.g == one.a
21+
ORDER BY bar_g, bar.h, foo_e, foo.f, one_a, one.b, two_c, two.d

‎ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1037,9 +1037,9 @@
10371037
],
10381038
"test.test[join-inmem_with_set_key--Debug]": [
10391039
{
1040-
"checksum": "a19c40afb1dc194764cb7af5cc15bf5d",
1041-
"size": 1661,
1042-
"uri": "https://{canondata_backend}/1937027/642fd2ff53bdb0fed32ca89598d70c9c5848ac20/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql"
1040+
"checksum": "87b1c4d78a0fc1cd034e00a2172a9779",
1041+
"size": 2707,
1042+
"uri": "https://{canondata_backend}/1814674/7b038fc802b56e98636f586bc8bf457d63ec69b9/resource.tar.gz#test.test_join-inmem_with_set_key--Debug_/opt.yql"
10431043
}
10441044
],
10451045
"test.test[join-inmem_with_set_key--Plan]": [
@@ -1051,9 +1051,9 @@
10511051
],
10521052
"test.test[join-inmem_with_set_key--Results]": [
10531053
{
1054-
"checksum": "23c66334b365b45719fb256537cbf694",
1055-
"size": 31913,
1056-
"uri": "https://{canondata_backend}/1937027/642fd2ff53bdb0fed32ca89598d70c9c5848ac20/resource.tar.gz#test.test_join-inmem_with_set_key--Results_/results.txt"
1054+
"checksum": "c6968036537e881bf0f50a0ee3004573",
1055+
"size": 33117,
1056+
"uri": "https://{canondata_backend}/1814674/7b038fc802b56e98636f586bc8bf457d63ec69b9/resource.tar.gz#test.test_join-inmem_with_set_key--Results_/results.txt"
10571057
}
10581058
],
10591059
"test.test[join-inner_all_right--Debug]": [

‎ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1211,9 +1211,9 @@
12111211
],
12121212
"test.test[join-inmem_with_set_key_any--Debug]": [
12131213
{
1214-
"checksum": "cf6e0ef8b42b11747615e9471528801b",
1215-
"size": 1720,
1216-
"uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql"
1214+
"checksum": "0fc6001fb0b21cf98772fa765a580630",
1215+
"size": 2766,
1216+
"uri": "https://{canondata_backend}/1937492/ba27d5b67f2650fd062c69f5d0d46bec1338a05c/resource.tar.gz#test.test_join-inmem_with_set_key_any--Debug_/opt.yql"
12171217
}
12181218
],
12191219
"test.test[join-inmem_with_set_key_any--Plan]": [
@@ -1225,9 +1225,9 @@
12251225
],
12261226
"test.test[join-inmem_with_set_key_any--Results]": [
12271227
{
1228-
"checksum": "02aac88d89f6306620cf48b1a339da0f",
1229-
"size": 7822,
1230-
"uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_join-inmem_with_set_key_any--Results_/results.txt"
1228+
"checksum": "64d1f142a4fb5bd322f49c6f08435f3e",
1229+
"size": 9026,
1230+
"uri": "https://{canondata_backend}/1937492/ba27d5b67f2650fd062c69f5d0d46bec1338a05c/resource.tar.gz#test.test_join-inmem_with_set_key_any--Results_/results.txt"
12311231
}
12321232
],
12331233
"test.test[join-lookupjoin_inner--Debug]": [

0 commit comments

Comments
 (0)