Skip to content

Commit 3a40625

Browse files
2010YOUY01findepi
andauthored
test: Fix flaky join tests (#16860)
* Fix flaky join tests * fix flaky join slts * Update datafusion/sqllogictest/test_files/joins.slt Co-authored-by: Piotr Findeisen <piotr.findeisen@gmail.com> * Update datafusion/sqllogictest/test_files/joins.slt Co-authored-by: Piotr Findeisen <piotr.findeisen@gmail.com> * Update datafusion/sqllogictest/test_files/joins.slt Co-authored-by: Piotr Findeisen <piotr.findeisen@gmail.com> --------- Co-authored-by: Piotr Findeisen <piotr.findeisen@gmail.com>
1 parent 14ac31d commit 3a40625

File tree

2 files changed

+39
-19
lines changed

2 files changed

+39
-19
lines changed

datafusion/sqllogictest/test_files/join.slt.part

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -853,47 +853,47 @@ physical_plan
853853
03)----DataSourceExec: partitions=1, partition_sizes=[1]
854854
04)----DataSourceExec: partitions=1, partition_sizes=[1]
855855

856-
query ITT
856+
query ITT rowsort
857857
SELECT e.emp_id, e.name, d.dept_name
858858
FROM employees AS e
859859
LEFT JOIN department AS d
860860
ON (e.name = 'Alice' OR e.name = 'Bob');
861861
----
862-
1 Alice HR
863862
1 Alice Engineering
863+
1 Alice HR
864864
1 Alice Sales
865-
2 Bob HR
866865
2 Bob Engineering
866+
2 Bob HR
867867
2 Bob Sales
868868
3 Carol NULL
869869

870870
# neither RIGHT OUTER JOIN
871-
query ITT
871+
query ITT rowsort
872872
SELECT e.emp_id, e.name, d.dept_name
873873
FROM department AS d
874874
RIGHT JOIN employees AS e
875875
ON (e.name = 'Alice' OR e.name = 'Bob');
876876
----
877-
1 Alice HR
878877
1 Alice Engineering
878+
1 Alice HR
879879
1 Alice Sales
880-
2 Bob HR
881880
2 Bob Engineering
881+
2 Bob HR
882882
2 Bob Sales
883883
3 Carol NULL
884884

885885
# neither FULL OUTER JOIN
886-
query ITT
886+
query ITT rowsort
887887
SELECT e.emp_id, e.name, d.dept_name
888888
FROM department AS d
889889
FULL JOIN employees AS e
890890
ON (e.name = 'Alice' OR e.name = 'Bob');
891891
----
892-
1 Alice HR
893892
1 Alice Engineering
893+
1 Alice HR
894894
1 Alice Sales
895-
2 Bob HR
896895
2 Bob Engineering
896+
2 Bob HR
897897
2 Bob Sales
898898
3 Carol NULL
899899

datafusion/sqllogictest/test_files/joins.slt

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4164,23 +4164,43 @@ AS VALUES
41644164
(3, 3, true),
41654165
(3, 3, false);
41664166

4167-
query IIIIB
4168-
SELECT * FROM t0 FULL JOIN t1 ON t0.c1 = t1.c1 LIMIT 2;
4167+
query IIIIB rowsort
4168+
-- Note: using LIMIT value higher than cardinality before LIMIT to avoid query non-determinism
4169+
SELECT * FROM t0 FULL JOIN t1 ON t0.c1 = t1.c1 LIMIT 20;
41694170
----
4170-
2 2 2 2 true
4171+
1 1 NULL NULL NULL
41714172
2 2 2 2 false
4172-
4173-
query IIIIB
4174-
SELECT * FROM t0 FULL JOIN t1 ON t0.c2 >= t1.c2 LIMIT 2;
4175-
----
41764173
2 2 2 2 true
4177-
3 3 2 2 true
4174+
3 3 3 3 false
4175+
3 3 3 3 true
4176+
4 4 NULL NULL NULL
41784177

4179-
query IIIIB
4180-
SELECT * FROM t0 FULL JOIN t1 ON t0.c1 = t1.c1 AND t0.c2 >= t1.c2 LIMIT 2;
4178+
query IIIIB rowsort
4179+
-- Note: using LIMIT value higher than cardinality before LIMIT to avoid query non-determinism
4180+
SELECT * FROM t0 FULL JOIN t1 ON t0.c2 >= t1.c2 LIMIT 20;
41814181
----
4182+
1 1 NULL NULL NULL
4183+
2 2 2 2 false
41824184
2 2 2 2 true
4185+
3 3 2 2 false
4186+
3 3 2 2 true
4187+
3 3 3 3 false
4188+
3 3 3 3 true
4189+
4 4 2 2 false
4190+
4 4 2 2 true
4191+
4 4 3 3 false
4192+
4 4 3 3 true
4193+
4194+
query IIIIB rowsort
4195+
-- Note: using LIMIT value higher than cardinality before LIMIT to avoid query non-determinism
4196+
SELECT * FROM t0 FULL JOIN t1 ON t0.c1 = t1.c1 AND t0.c2 >= t1.c2 LIMIT 20;
4197+
----
4198+
1 1 NULL NULL NULL
41834199
2 2 2 2 false
4200+
2 2 2 2 true
4201+
3 3 3 3 false
4202+
3 3 3 3 true
4203+
4 4 NULL NULL NULL
41844204

41854205
## Test !join.on.is_empty() && join.filter.is_none()
41864206
query TT

0 commit comments

Comments
 (0)