Skip to content

Commit

Permalink
refactored suites/blocks to compare block and non-block results (ydb-…
Browse files Browse the repository at this point in the history 
…platform#5462)
  • Loading branch information
@vitstn
vitstn authored Jun 11, 2024
1 parent 95fc262 commit 1771396
Show file tree
Hide file tree
Showing 182 changed files with 3,386 additions and 3,530 deletions.
7 changes: 7 additions & 0 deletions ydb/library/yql/tests/common/test_framework/yql_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,13 @@ def is_canonize_peephole(cfg):
return False


def is_peephole_use_blocks(cfg):
for item in cfg:
if item[0] == 'peephole_use_blocks':
return True
return False


def is_canonize_lineage(cfg):
for item in cfg:
if item[0] == 'canonize_lineage':
Expand Down
72 changes: 36 additions & 36 deletions ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,89 +489,89 @@
],
"test.test[blocks-combine_all_pg_filter--Analyze]": [
{
"checksum": "cb30717cca1cf1bf0c11f384cef516ff",
"size": 6207,
"uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Analyze_/plan.txt"
"checksum": "c3b16fe4800fae5d1ff43e13aa457253",
"size": 5795,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Analyze_/plan.txt"
}
],
"test.test[blocks-combine_all_pg_filter--Debug]": [
{
"checksum": "58196ba712ed9a04008cb3b45110bb7f",
"size": 5954,
"uri": "https://{canondata_backend}/1689644/bb7a5ebb839768b3371fdb6466d95c49c7caa5bc/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Debug_/opt.yql_patched"
"checksum": "09e447afdeb105b431c8a6c72ad4f4ca",
"size": 7962,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Debug_/opt.yql_patched"
}
],
"test.test[blocks-combine_all_pg_filter--Plan]": [
{
"checksum": "cb30717cca1cf1bf0c11f384cef516ff",
"size": 6207,
"uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Plan_/plan.txt"
"checksum": "c3b16fe4800fae5d1ff43e13aa457253",
"size": 5795,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-combine_all_pg_filter--Plan_/plan.txt"
}
],
"test.test[blocks-combine_all_pg_filter--Results]": [],
"test.test[blocks-minmax_strings--Analyze]": [
{
"checksum": "8a75fbb5e579f9a872fefea76b24e45a",
"size": 10317,
"uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-minmax_strings--Analyze_/plan.txt"
"checksum": "c7ee53737e6d53e828dbde452c83921d",
"size": 5087,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-minmax_strings--Analyze_/plan.txt"
}
],
"test.test[blocks-minmax_strings--Debug]": [
{
"checksum": "048594428b01ff1bf2f66084f044bb04",
"size": 7473,
"uri": "https://{canondata_backend}/1937027/de4be6db5a9d9653a2d7cf00ba5ccfe48c1b3a99/resource.tar.gz#test.test_blocks-minmax_strings--Debug_/opt.yql_patched"
"checksum": "deba8327c0dcd91ae41730de550acd6b",
"size": 5782,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-minmax_strings--Debug_/opt.yql_patched"
}
],
"test.test[blocks-minmax_strings--Plan]": [
{
"checksum": "8a75fbb5e579f9a872fefea76b24e45a",
"size": 10317,
"uri": "https://{canondata_backend}/1923547/63814b1113aa44b294fe28fd8a7c507858e712bd/resource.tar.gz#test.test_blocks-minmax_strings--Plan_/plan.txt"
"checksum": "c7ee53737e6d53e828dbde452c83921d",
"size": 5087,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-minmax_strings--Plan_/plan.txt"
}
],
"test.test[blocks-minmax_strings--Results]": [],
"test.test[blocks-nested_optionals--Analyze]": [
{
"checksum": "5670e60dfd13457111e1f9a99808aaf7",
"size": 3706,
"uri": "https://{canondata_backend}/1936997/a36e4ac0da388a8e1ac773455c73c5a459846a00/resource.tar.gz#test.test_blocks-nested_optionals--Analyze_/plan.txt"
"checksum": "ea20e16a8962e678b82cfadc58641d58",
"size": 3701,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-nested_optionals--Analyze_/plan.txt"
}
],
"test.test[blocks-nested_optionals--Debug]": [
{
"checksum": "040158cdb1784a33f17f6e4bc2acb7a5",
"size": 1502,
"uri": "https://{canondata_backend}/1689644/bb7a5ebb839768b3371fdb6466d95c49c7caa5bc/resource.tar.gz#test.test_blocks-nested_optionals--Debug_/opt.yql_patched"
"checksum": "6a30d4dba5e77af2d073c825e14a9a65",
"size": 1445,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-nested_optionals--Debug_/opt.yql_patched"
}
],
"test.test[blocks-nested_optionals--Plan]": [
{
"checksum": "5670e60dfd13457111e1f9a99808aaf7",
"size": 3706,
"uri": "https://{canondata_backend}/1937150/af1149e4ecbbaf59deead854c81e1ca2a679d76d/resource.tar.gz#test.test_blocks-nested_optionals--Plan_/plan.txt"
"checksum": "ea20e16a8962e678b82cfadc58641d58",
"size": 3701,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-nested_optionals--Plan_/plan.txt"
}
],
"test.test[blocks-nested_optionals--Results]": [],
"test.test[blocks-tuple_type--Analyze]": [
{
"checksum": "ba2a8428a72e0ef51d7f5a825ffd3d1e",
"size": 3705,
"uri": "https://{canondata_backend}/1936997/a36e4ac0da388a8e1ac773455c73c5a459846a00/resource.tar.gz#test.test_blocks-tuple_type--Analyze_/plan.txt"
"checksum": "d2ab88d7ed03e7cc274df0656c6ada27",
"size": 3700,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-tuple_type--Analyze_/plan.txt"
}
],
"test.test[blocks-tuple_type--Debug]": [
{
"checksum": "ebb1675d6f767eff45ee1716fa246ab7",
"size": 1604,
"uri": "https://{canondata_backend}/1689644/bb7a5ebb839768b3371fdb6466d95c49c7caa5bc/resource.tar.gz#test.test_blocks-tuple_type--Debug_/opt.yql_patched"
"checksum": "1048d72269abeead031d38eada76c689",
"size": 1547,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-tuple_type--Debug_/opt.yql_patched"
}
],
"test.test[blocks-tuple_type--Plan]": [
{
"checksum": "ba2a8428a72e0ef51d7f5a825ffd3d1e",
"size": 3705,
"uri": "https://{canondata_backend}/1937150/af1149e4ecbbaf59deead854c81e1ca2a679d76d/resource.tar.gz#test.test_blocks-tuple_type--Plan_/plan.txt"
"checksum": "d2ab88d7ed03e7cc274df0656c6ada27",
"size": 3700,
"uri": "https://{canondata_backend}/1942173/8e89d11f444b9bfa5ce3b1040f7d67aa7d59d029/resource.tar.gz#test.test_blocks-tuple_type--Plan_/plan.txt"
}
],
"test.test[blocks-tuple_type--Results]": [],
Expand Down
86 changes: 43 additions & 43 deletions ydb/library/yql/tests/sql/dq_file/part1/canondata/result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,92 +599,92 @@
"test.test[binding-table_concat_strict_binding-default.txt-Results]": [],
"test.test[blocks-combine_hashed_min--Analyze]": [
{
"checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
"size": 6184,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_min--Analyze_/plan.txt"
"checksum": "f06adc774a6af156f64acac58c0c83d2",
"size": 5135,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_min--Analyze_/plan.txt"
}
],
"test.test[blocks-combine_hashed_min--Debug]": [
{
"checksum": "398f18ef6a29c6f822997d596000ea27",
"size": 3129,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_min--Debug_/opt.yql_patched"
"checksum": "d8d3fe568029640d7524d09e52e0cf34",
"size": 3347,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_min--Debug_/opt.yql_patched"
}
],
"test.test[blocks-combine_hashed_min--Plan]": [
{
"checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
"size": 6184,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_min--Plan_/plan.txt"
"checksum": "f06adc774a6af156f64acac58c0c83d2",
"size": 5135,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_min--Plan_/plan.txt"
}
],
"test.test[blocks-combine_hashed_min--Results]": [],
"test.test[blocks-combine_hashed_minmax_double--Analyze]": [
{
"checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
"size": 6184,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Analyze_/plan.txt"
"checksum": "f06adc774a6af156f64acac58c0c83d2",
"size": 5135,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Analyze_/plan.txt"
}
],
"test.test[blocks-combine_hashed_minmax_double--Debug]": [
{
"checksum": "e01e88e1444c41c1f8d21d1a5237e551",
"size": 2651,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Debug_/opt.yql_patched"
"checksum": "5a6fc028c0a35d4d0ba267869f403711",
"size": 2728,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Debug_/opt.yql_patched"
}
],
"test.test[blocks-combine_hashed_minmax_double--Plan]": [
{
"checksum": "ed96fce91ec9eed1bda8c4428f6e0f2a",
"size": 6184,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Plan_/plan.txt"
"checksum": "f06adc774a6af156f64acac58c0c83d2",
"size": 5135,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_minmax_double--Plan_/plan.txt"
}
],
"test.test[blocks-combine_hashed_minmax_double--Results]": [],
"test.test[blocks-combine_hashed_set--Analyze]": [
{
"checksum": "8e37a495395d396b51f75e9400f208cf",
"size": 5854,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_set--Analyze_/plan.txt"
"checksum": "02fbea6f13142d1fa15cf37a3d99ab70",
"size": 5005,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_set--Analyze_/plan.txt"
}
],
"test.test[blocks-combine_hashed_set--Debug]": [
{
"checksum": "e3f5652dd919c7ae5e35c6463089fd3f",
"size": 1874,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_set--Debug_/opt.yql_patched"
"checksum": "65a5d7afe9c0e1218ae4c6c8133be667",
"size": 1805,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_set--Debug_/opt.yql_patched"
}
],
"test.test[blocks-combine_hashed_set--Plan]": [
{
"checksum": "8e37a495395d396b51f75e9400f208cf",
"size": 5854,
"uri": "https://{canondata_backend}/1923547/eb397e7e75a7ff316191f787f130964fedc0010a/resource.tar.gz#test.test_blocks-combine_hashed_set--Plan_/plan.txt"
"checksum": "02fbea6f13142d1fa15cf37a3d99ab70",
"size": 5005,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-combine_hashed_set--Plan_/plan.txt"
}
],
"test.test[blocks-combine_hashed_set--Results]": [],
"test.test[blocks-partial_blocks1--Analyze]": [
{
"checksum": "5670e60dfd13457111e1f9a99808aaf7",
"size": 3706,
"uri": "https://{canondata_backend}/1942278/c7e94a55443ba1bfb954699e3753bab75896bf89/resource.tar.gz#test.test_blocks-partial_blocks1--Analyze_/plan.txt"
"checksum": "ea20e16a8962e678b82cfadc58641d58",
"size": 3701,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-partial_blocks1--Analyze_/plan.txt"
},
{
"uri": "file://test.test_blocks-partial_blocks1--Analyze_/extracted"
}
],
"test.test[blocks-partial_blocks1--Debug]": [
{
"checksum": "fea025c234b84266a441164e3fab46da",
"size": 1657,
"uri": "https://{canondata_backend}/1917492/1ed6d08398686e90568735860251083949d84e4e/resource.tar.gz#test.test_blocks-partial_blocks1--Debug_/opt.yql_patched"
"checksum": "b7975d17ee19918f361bb79d2cb22232",
"size": 1600,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-partial_blocks1--Debug_/opt.yql_patched"
}
],
"test.test[blocks-partial_blocks1--Plan]": [
{
"checksum": "5670e60dfd13457111e1f9a99808aaf7",
"size": 3706,
"uri": "https://{canondata_backend}/1903280/cfc00695f60d304a5b897d2cf0fdcda9f6f0bc03/resource.tar.gz#test.test_blocks-partial_blocks1--Plan_/plan.txt"
"checksum": "ea20e16a8962e678b82cfadc58641d58",
"size": 3701,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-partial_blocks1--Plan_/plan.txt"
}
],
"test.test[blocks-partial_blocks1--Results]": [
Expand All @@ -694,23 +694,23 @@
],
"test.test[blocks-string_len_and_cmp--Analyze]": [
{
"checksum": "31497945edfc3d517c9f35cb88794172",
"checksum": "43ffc8dff42be9bb6da1c637abdca800",
"size": 4342,
"uri": "https://{canondata_backend}/1784826/97aa276d9864fe43e1075c4a61455477d34ea97f/resource.tar.gz#test.test_blocks-string_len_and_cmp--Analyze_/plan.txt"
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-string_len_and_cmp--Analyze_/plan.txt"
}
],
"test.test[blocks-string_len_and_cmp--Debug]": [
{
"checksum": "ffb5266e2d0d030046813a92ea6fd381",
"size": 3201,
"uri": "https://{canondata_backend}/1784826/97aa276d9864fe43e1075c4a61455477d34ea97f/resource.tar.gz#test.test_blocks-string_len_and_cmp--Debug_/opt.yql_patched"
"checksum": "9c068215af571b5ccf867817a0421e57",
"size": 3144,
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-string_len_and_cmp--Debug_/opt.yql_patched"
}
],
"test.test[blocks-string_len_and_cmp--Plan]": [
{
"checksum": "31497945edfc3d517c9f35cb88794172",
"checksum": "43ffc8dff42be9bb6da1c637abdca800",
"size": 4342,
"uri": "https://{canondata_backend}/1784826/97aa276d9864fe43e1075c4a61455477d34ea97f/resource.tar.gz#test.test_blocks-string_len_and_cmp--Plan_/plan.txt"
"uri": "https://{canondata_backend}/1942173/eee032b3354d69a6e319d8f41f249f7e53178373/resource.tar.gz#test.test_blocks-string_len_and_cmp--Plan_/plan.txt"
}
],
"test.test[blocks-string_len_and_cmp--Results]": [],
Expand Down
6 changes: 3 additions & 3 deletions ...ql/tests/sql/dq_file/part1/canondata/test.test_blocks-partial_blocks1--Analyze_/extracted
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<tmp_path>/program.sql:<main>: Warning: Type annotation

<tmp_path>/program.sql:<main>:4:1: Warning: At function: RemovePrefixMembers, At function: Unordered, At function: PersistableRepr, At function: OrderedSqlProject, At function: SqlProjectItem
<tmp_path>/program.sql:<main>:3:1: Warning: At function: RemovePrefixMembers, At function: Unordered, At function: PersistableRepr, At function: OrderedSqlProject, At function: SqlProjectItem
SELECT
^
<tmp_path>/program.sql:<main>:5:6: Warning: At function: *
<tmp_path>/program.sql:<main>:4:6: Warning: At function: *
2*(key+subkey),1ul+key+key+key,subkey+2ul,key
^
<tmp_path>/program.sql:<main>:5:6: Warning: Integral type implicit bitcast: Int32 and Uint64
<tmp_path>/program.sql:<main>:4:6: Warning: Integral type implicit bitcast: Int32 and Uint64
2*(key+subkey),1ul+key+key+key,subkey+2ul,key
^
6 changes: 3 additions & 3 deletions ...ql/tests/sql/dq_file/part1/canondata/test.test_blocks-partial_blocks1--Results_/extracted
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<tmp_path>/program.sql:<main>: Warning: Type annotation

<tmp_path>/program.sql:<main>:4:1: Warning: At function: RemovePrefixMembers, At function: Unordered, At function: PersistableRepr, At function: OrderedSqlProject, At function: SqlProjectItem
<tmp_path>/program.sql:<main>:3:1: Warning: At function: RemovePrefixMembers, At function: Unordered, At function: PersistableRepr, At function: OrderedSqlProject, At function: SqlProjectItem
SELECT
^
<tmp_path>/program.sql:<main>:5:6: Warning: At function: *
<tmp_path>/program.sql:<main>:4:6: Warning: At function: *
2*(key+subkey),1ul+key+key+key,subkey+2ul,key
^
<tmp_path>/program.sql:<main>:5:6: Warning: Integral type implicit bitcast: Int32 and Uint64
<tmp_path>/program.sql:<main>:4:6: Warning: Integral type implicit bitcast: Int32 and Uint64
2*(key+subkey),1ul+key+key+key,subkey+2ul,key
^
Loading

0 comments on commit 1771396

Please sign in to comment.