From 477d14794597bf7e9f5588023c033ebf6beeb407 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Mon, 9 Sep 2024 14:53:58 +0800 Subject: [PATCH 1/2] [SPARK-49246][TESTS] Fix CollationSuite --- .../scala/org/apache/spark/sql/CollationSuite.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala index da8aad16f55d2..dcb9291766cde 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala @@ -947,7 +947,10 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper { withTable(table) { sql(s"create table $table (a array) using parquet") sql(s"insert into $table values (array('aaa')), (array('AAA'))") - checkAnswer(sql(s"select distinct a from $table"), Seq(Row(Seq("aaa")))) + val result = sql(s"select distinct a from $table").collect() + assert(result.length === 1) + val data = result.head.get(0).asInstanceOf[scala.collection.mutable.ArraySeq[String]] + assert(data === Array("aaa") || data === Array("AAA")) } // map doesn't support aggregation withTable(table) { @@ -968,7 +971,10 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper { withTable(table) { sql(s"create table $table (s struct) using parquet") sql(s"insert into $table values (named_struct('fld', 'aaa')), (named_struct('fld', 'AAA'))") - checkAnswer(sql(s"select s.fld from $table group by s"), Seq(Row("aaa"))) + val result = sql(s"select s.fld from $table group by s").collect() + assert(result.length === 1) + val data = result.head.getString(0) + assert(data === "aaa" || data === "AAA") } } From 3ae56c06f628b169140d069524d39b29ac2ac471 Mon Sep 17 00:00:00 2001 From: panbingkun Date: Mon, 9 Sep 2024 19:06:18 +0800 Subject: [PATCH 2/2] update --- .../src/test/scala/org/apache/spark/sql/CollationSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala index dcb9291766cde..031bf337cec90 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala @@ -949,7 +949,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper { sql(s"insert into $table values (array('aaa')), (array('AAA'))") val result = sql(s"select distinct a from $table").collect() assert(result.length === 1) - val data = result.head.get(0).asInstanceOf[scala.collection.mutable.ArraySeq[String]] + val data = result.head.getSeq[String](0) assert(data === Array("aaa") || data === Array("AAA")) } // map doesn't support aggregation