[SPARK-35431][SQL][TESTS] Sort elements generated by collect_set in S…

…QLQueryTestSuite ### What changes were proposed in this pull request? To pass `subquery/scalar-subquery/scalar-subquery-select.sql` (`SQLQueryTestSuite`) in Scala v2.13, this PR proposes to change the aggregate expr of a test query in the file from `collect_set(...)` to `sort_array(collect_set(...))` because `collect_set` depends on the `mutable.HashSet` implementation and elements in the set are printed in a different order in Scala v2.12/v2.13. ### Why are the changes needed? To pass the test in Scala v2.13. ### Does this PR introduce _any_ user-facing change? No, dev-only. ### How was this patch tested? Manually checked. Closes apache#32578 from maropu/FixSQLTestIssueInScala213. Authored-by: Takeshi Yamamuro <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
srowen · May 18, 2021 · 3b859a1 · 3b859a1
1 parent 747fe72
commit 3b859a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...e/src/test/resources/sql-tests/inputs/subquery/scalar-subquery/scalar-subquery-select.sql b/...e/src/test/resources/sql-tests/inputs/subquery/scalar-subquery/scalar-subquery-select.sql
@@ -135,6 +135,6 @@ SELECT t1a,
  (SELECT count_if(t2d > 0) FROM t2 WHERE t2a = t1a) count_if_t2,
  (SELECT approx_count_distinct(t2d) FROM t2 WHERE t2a = t1a) approx_count_distinct_t2,
  (SELECT collect_list(t2d) FROM t2 WHERE t2a = t1a) collect_list_t2,
- (SELECT collect_set(t2d) FROM t2 WHERE t2a = t1a) collect_set_t2,
+ (SELECT sort_array(collect_set(t2d)) FROM t2 WHERE t2a = t1a) collect_set_t2,
  (SELECT hex(count_min_sketch(t2d, 0.5d, 0.5d, 1)) FROM t2 WHERE t2a = t1a) collect_set_t2
 FROM t1;
diff --git a/.../test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-select.sql.out b/.../test/resources/sql-tests/results/subquery/scalar-subquery/scalar-subquery-select.sql.out
@@ -204,7 +204,7 @@ SELECT t1a,
  (SELECT count_if(t2d > 0) FROM t2 WHERE t2a = t1a) count_if_t2,
  (SELECT approx_count_distinct(t2d) FROM t2 WHERE t2a = t1a) approx_count_distinct_t2,
  (SELECT collect_list(t2d) FROM t2 WHERE t2a = t1a) collect_list_t2,
- (SELECT collect_set(t2d) FROM t2 WHERE t2a = t1a) collect_set_t2,
+ (SELECT sort_array(collect_set(t2d)) FROM t2 WHERE t2a = t1a) collect_set_t2,
  (SELECT hex(count_min_sketch(t2d, 0.5d, 0.5d, 1)) FROM t2 WHERE t2a = t1a) collect_set_t2
 FROM t1
 -- !query schema
@@ -215,7 +215,7 @@ val1a 0 0 0 [] [] 0000000100000000000000000000000100000004000000005D8D6AB9000000
 val1a 0 0 0 [] [] 0000000100000000000000000000000100000004000000005D8D6AB90000000000000000000000000000000000000000000000000000000000000000
 val1a 0 0 0 [] [] 0000000100000000000000000000000100000004000000005D8D6AB90000000000000000000000000000000000000000000000000000000000000000
 val1b 6 6 3 [19,119,319,19,19,19] [19,119,319] 0000000100000000000000060000000100000004000000005D8D6AB90000000000000000000000000000000400000000000000010000000000000001
-val1c 2 2 2 [219,19] [219,19] 0000000100000000000000020000000100000004000000005D8D6AB90000000000000000000000000000000100000000000000000000000000000001
+val1c 2 2 2 [219,19] [19,219] 0000000100000000000000020000000100000004000000005D8D6AB90000000000000000000000000000000100000000000000000000000000000001
 val1d 0 0 0 [] [] 0000000100000000000000000000000100000004000000005D8D6AB90000000000000000000000000000000000000000000000000000000000000000
 val1d 0 0 0 [] [] 0000000100000000000000000000000100000004000000005D8D6AB90000000000000000000000000000000000000000000000000000000000000000
 val1d 0 0 0 [] [] 0000000100000000000000000000000100000004000000005D8D6AB90000000000000000000000000000000000000000000000000000000000000000