diff --git a/datafusion/physical-plan/src/joins/hash_join.rs b/datafusion/physical-plan/src/joins/hash_join.rs index 063f35059fb8..fefec0d26fa4 100644 --- a/datafusion/physical-plan/src/joins/hash_join.rs +++ b/datafusion/physical-plan/src/joins/hash_join.rs @@ -1933,7 +1933,6 @@ mod tests { // FIXME(#TODO) test fails with feature `force_hash_collisions` // https://github.com/apache/datafusion/issues/11658 - #[cfg(not(feature = "force_hash_collisions"))] #[apply(batch_sizes)] #[tokio::test] async fn join_inner_two(batch_size: usize) -> Result<()> { @@ -1991,7 +1990,6 @@ mod tests { /// Test where the left has 2 parts, the right with 1 part => 1 part // FIXME(#TODO) test fails with feature `force_hash_collisions` // https://github.com/apache/datafusion/issues/11658 - #[cfg(not(feature = "force_hash_collisions"))] #[apply(batch_sizes)] #[tokio::test] async fn join_inner_one_two_parts_left(batch_size: usize) -> Result<()> { @@ -2106,7 +2104,6 @@ mod tests { /// Test where the left has 1 part, the right has 2 parts => 2 parts // FIXME(#TODO) test fails with feature `force_hash_collisions` // https://github.com/apache/datafusion/issues/11658 - #[cfg(not(feature = "force_hash_collisions"))] #[apply(batch_sizes)] #[tokio::test] async fn join_inner_one_two_parts_right(batch_size: usize) -> Result<()> { diff --git a/datafusion/sqllogictest/test_files/parquet.slt b/datafusion/sqllogictest/test_files/parquet.slt index 3342f85c8141..4098e2919506 100644 --- a/datafusion/sqllogictest/test_files/parquet.slt +++ b/datafusion/sqllogictest/test_files/parquet.slt @@ -254,24 +254,24 @@ SELECT COUNT(*) FROM timestamp_with_tz; # FIXME(#TODO) fails with feature `force_hash_collisions` # https://github.com/apache/datafusion/issues/11660 # Perform the query: -# query IPT -# SELECT -# count, -# LAG(timestamp, 1) OVER (ORDER BY timestamp), -# arrow_typeof(LAG(timestamp, 1) OVER (ORDER BY timestamp)) -# FROM timestamp_with_tz -# LIMIT 10; -# ---- -# 0 NULL Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 4 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 14 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) -# 0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +query IPT +SELECT + count, + LAG(timestamp, 1) OVER (ORDER BY timestamp), + arrow_typeof(LAG(timestamp, 1) OVER (ORDER BY timestamp)) +FROM timestamp_with_tz +LIMIT 10; +---- +0 NULL Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +4 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +14 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) +0 2014-08-27T14:00:00Z Timestamp(Millisecond, Some("UTC")) # Test config listing_table_ignore_subdirectory: diff --git a/datafusion/sqllogictest/test_files/sort_merge_join.slt b/datafusion/sqllogictest/test_files/sort_merge_join.slt index 6e7b50973cde..580f868209a8 100644 --- a/datafusion/sqllogictest/test_files/sort_merge_join.slt +++ b/datafusion/sqllogictest/test_files/sort_merge_join.slt @@ -241,15 +241,15 @@ NULL NULL NULL 55 w 3 # FIXME(#TODO) fails with feature `force_hash_collisions` # https://github.com/apache/datafusion/issues/11659 # equijoin_full_and_condition_from_both -# query ITIITI rowsort -# SELECT * FROM t1 FULL JOIN t2 ON t1_id = t2_id AND t2_int <= t1_int -# ---- -# 11 a 1 NULL NULL NULL -# 22 b 2 22 y 1 -# 33 c 3 NULL NULL NULL -# 44 d 4 44 x 3 -# NULL NULL NULL 11 z 3 -# NULL NULL NULL 55 w 3 +query ITIITI rowsort +SELECT * FROM t1 FULL JOIN t2 ON t1_id = t2_id AND t2_int <= t1_int +---- +11 a 1 NULL NULL NULL +22 b 2 22 y 1 +33 c 3 NULL NULL NULL +44 d 4 44 x 3 +NULL NULL NULL 11 z 3 +NULL NULL NULL 55 w 3 statement ok DROP TABLE t1;