From 21ddfde89ea7f84e6fa825fee3fd61d79af362c1 Mon Sep 17 00:00:00 2001 From: peterxcli Date: Thu, 1 Oct 2026 10:13:06 +0800 Subject: [PATCH] test: enable SPARK-57298 collect_set tests --- dev/diffs/4.2.0.diff | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/dev/diffs/4.2.0.diff b/dev/diffs/4.2.0.diff index 60ad822d6d2..146398adbd4 100644 --- a/dev/diffs/4.2.0.diff +++ b/dev/diffs/4.2.0.diff @@ -422,7 +422,7 @@ index 085dbcd8046..3090d321b6c 100644 withTempView("t0", "t1", "t2") { diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala -index 5b8154d2900..f01366b66bc 100644 +index 5b8154d2900..853bd705cf2 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala @@ -30,8 +30,9 @@ import org.apache.spark.sql.catalyst.util.AUTO_GENERATED_ALIAS @@ -436,18 +436,7 @@ index 5b8154d2900..f01366b66bc 100644 import org.apache.spark.sql.expressions.Window import org.apache.spark.sql.functions._ import org.apache.spark.sql.internal.SQLConf -@@ -667,7 +668,9 @@ class DataFrameAggregateSuite extends SharedSparkSession - df.selectExpr("sort_array(collect_set(b) RESPECT NULLS)"), Seq(Row(Seq(null, 2)))) - } - -- test("SPARK-57298: collect_set normalizes NaN and -0.0 for floating-point types") { -+ test("SPARK-57298: collect_set normalizes NaN and -0.0 for floating-point types", -+ // Comet's native collect_set does not yet normalize NaN / -0.0. -+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/4966")) { - checkAnswer( - sql("SELECT collect_set(v) FROM VALUES (double('NaN')), (double('NaN')) AS t(v)"), - Row(Seq(Double.NaN))) -@@ -932,7 +935,9 @@ class DataFrameAggregateSuite extends SharedSparkSession +@@ -932,7 +933,9 @@ class DataFrameAggregateSuite extends SharedSparkSession case _ => false }.isDefined) } else { @@ -458,7 +447,7 @@ index 5b8154d2900..f01366b66bc 100644 } // test case for ObjectHashAggregate and SortAggregate -@@ -991,12 +996,12 @@ class DataFrameAggregateSuite extends SharedSparkSession +@@ -991,12 +994,12 @@ class DataFrameAggregateSuite extends SharedSparkSession assert(sortAggPlans.isEmpty) val objHashAggPlans = collect(aggPlan) {