From 056a06d7eca7550d94b108a308bce9608de4e32d Mon Sep 17 00:00:00 2001
From: Eduard Karacharov <eduard.karacharov@gmail.com>
Date: Sun, 1 Sep 2024 15:49:27 +0300
Subject: [PATCH] test: re-enable merge join test with forced collisions

---
 .../test_files/sort_merge_join.slt            | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/datafusion/sqllogictest/test_files/sort_merge_join.slt b/datafusion/sqllogictest/test_files/sort_merge_join.slt
index 2c28a5feadba..ebd53e9690fc 100644
--- a/datafusion/sqllogictest/test_files/sort_merge_join.slt
+++ b/datafusion/sqllogictest/test_files/sort_merge_join.slt
@@ -233,18 +233,16 @@ SELECT * FROM t1 FULL JOIN t2 ON t1_id = t2_id
 44 d 4 44 x 3
 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;