From f82ff5eaa4d672499c165dace62c4b2554d606d3 Mon Sep 17 00:00:00 2001
From: jackwener <jakevingoo@gmail.com>
Date: Sun, 5 Feb 2023 20:45:46 +0800
Subject: [PATCH] sqllogicaltest: use rowsort.

---
 .../test_files/pg_compat/pg_compat_union.slt  | 12 ++----
 .../tests/sqllogictests/test_files/union.slt  | 39 +++++++++++--------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_union.slt b/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_union.slt
index 31d2c3a0cfa5..5b1788bd7553 100644
--- a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_union.slt
+++ b/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_union.slt
@@ -67,7 +67,7 @@ STORED AS CSV
 WITH HEADER ROW
 LOCATION '../../testing/data/csv/aggregate_test_100.csv'
 
-query I
+query I rowsort
 SELECT * FROM (
     SELECT c2
     FROM aggregate_test_100_by_sql t1
@@ -76,13 +76,12 @@ SELECT * FROM (
     FROM aggregate_test_100_by_sql t2
     WHERE c2 IN (3, 4)
 ) s
-ORDER BY c2
 ----
 1
 2
 5
 
-query I
+query I rowsort
 SELECT * FROM (
     SELECT c2
     FROM aggregate_test_100_by_sql t1
@@ -91,7 +90,6 @@ SELECT * FROM (
     FROM aggregate_test_100_by_sql t2
     WHERE c2 IN (3, 4)
 ) s
-ORDER BY c2
 ----
 1
 1
@@ -153,7 +151,7 @@ ORDER BY c2
 5
 
 
-query I
+query I  rowsort
 SELECT * FROM (
     SELECT c2
     FROM aggregate_test_100_by_sql t1
@@ -162,13 +160,12 @@ SELECT * FROM (
     FROM aggregate_test_100_by_sql t2
     WHERE c2 IN (3, 4)
 ) s
-ORDER BY c2
 ----
 3
 4
 
 
-query I
+query I  rowsort
 SELECT * FROM (
     SELECT c2
     FROM aggregate_test_100_by_sql t1
@@ -177,7 +174,6 @@ SELECT * FROM (
     FROM aggregate_test_100_by_sql t2
     WHERE c2 IN (3, 4)
 ) s
-ORDER BY c2
 ----
 3
 3
diff --git a/datafusion/core/tests/sqllogictests/test_files/union.slt b/datafusion/core/tests/sqllogictests/test_files/union.slt
index d163d191e0e1..f8467dfc8e65 100644
--- a/datafusion/core/tests/sqllogictests/test_files/union.slt
+++ b/datafusion/core/tests/sqllogictests/test_files/union.slt
@@ -40,7 +40,7 @@ CREATE TABLE t2(
 ;
 
 # union with EXCEPT(JOIN)
-query T
+query T rowsort
 (   
     SELECT name FROM t1
     EXCEPT
@@ -52,13 +52,12 @@ UNION ALL
     EXCEPT
     SELECT name FROM t1
 )
-ORDER BY name
 ----
 Alice
 John
 
 # union with type coercion
-query T
+query T rowsort
 (   
     SELECT * FROM t1
     EXCEPT
@@ -70,17 +69,15 @@ UNION ALL
     EXCEPT
     SELECT * FROM t1
 )
-ORDER BY name
 ----
 3 Alice
 3 John
 
 # union all
-query I
+query I rowsort
 SELECT 1 as x
 UNION ALL
 SELECT 2 as x
-ORDER BY x
 ----
 1
 2
@@ -116,11 +113,10 @@ select COUNT(*) from (
 200
 
 # union_distinct
-query I
+query I rowsort
 SELECT 1 as x
 UNION
 SELECT 1 as x
-ORDER BY x
 ----
 1
 
@@ -148,21 +144,21 @@ SELECT COUNT(*) FROM (
 2
 
 # union_schemas
-query I
-SELECT 1 A UNION ALL SELECT 2 ORDER BY 1
+query I rowsort
+SELECT 1 A UNION ALL SELECT 2
 ----
 1
 2
 
 # union_schemas
-query I
-SELECT 1 UNION SELECT 2 ORDER BY 1
+query I rowsort
+SELECT 1 UNION SELECT 2
 ----
 1
 2
 
 # union_with_except_input
-query T
+query T rowsort
 (
     SELECT name FROM t1
     EXCEPT
@@ -174,13 +170,12 @@ UNION ALL
     EXCEPT
     SELECT name FROM t1
 )
-ORDER BY name
 ----
 Alice
 John
 
 # union_with_type_coercion
-query IT
+query IT rowsort
 (
     SELECT id, name FROM t1
     EXCEPT
@@ -192,7 +187,19 @@ UNION ALL
     EXCEPT
     SELECT id, name FROM t1
 )
-ORDER BY name
 ----
 3 Alice
 3 John
+
+########
+# Clean up after the test
+########
+
+statement ok
+drop table t1;
+
+statement ok
+drop table t2;
+
+statement ok
+drop table aggregate_test_100;