From b6dfb4d47cac98b58c41a0ffbc84934a71013b7a Mon Sep 17 00:00:00 2001 From: comphead Date: Tue, 19 May 2026 16:43:15 -0700 Subject: [PATCH 1/3] chore: enable ansi by default for Spark 4 tests --- spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala index 90ca585630..0f534a6a14 100644 --- a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala +++ b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala @@ -72,7 +72,9 @@ abstract class CometTestBase conf.set("spark.hadoop.fs.file.impl", classOf[DebugFilesystem].getName) conf.set("spark.ui.enabled", "false") conf.set(SQLConf.SHUFFLE_PARTITIONS, 10) // reduce parallelism in tests - conf.set(SQLConf.ANSI_ENABLED.key, "false") + val sparkMajorVersion = + SPARK_VERSION.split("\\.").headOption.flatMap(s => Try(s.toInt).toOption).getOrElse(0) + conf.set(SQLConf.ANSI_ENABLED.key, (sparkMajorVersion >= 4).toString) conf.set(SHUFFLE_MANAGER, shuffleManager) conf.set(MEMORY_OFFHEAP_ENABLED.key, "true") conf.set(MEMORY_OFFHEAP_SIZE.key, "2g") From 7fa6a4719535129da9230dccd57ad737c71eda43 Mon Sep 17 00:00:00 2001 From: comphead Date: Tue, 19 May 2026 16:57:26 -0700 Subject: [PATCH 2/3] chore: enable ansi by default for Spark 4 tests --- .../scala/org/apache/spark/sql/CometTestBase.scala | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala index 0f534a6a14..e1a480647a 100644 --- a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala +++ b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala @@ -19,15 +19,14 @@ package org.apache.spark.sql -import java.util.concurrent.atomic.AtomicInteger +import org.apache.comet.CometSparkSessionExtensions.isSpark40Plus +import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.duration._ import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag import scala.util.{Success, Try} - import org.scalatest.BeforeAndAfterEach - import org.apache.hadoop.fs.Path import org.apache.parquet.column.ParquetProperties import org.apache.parquet.example.data.Group @@ -46,7 +45,6 @@ import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper import org.apache.spark.sql.internal._ import org.apache.spark.sql.test._ import org.apache.spark.sql.types.{DecimalType, StructType} - import org.apache.comet._ import org.apache.comet.shims.ShimCometSparkSessionExtensions @@ -72,9 +70,7 @@ abstract class CometTestBase conf.set("spark.hadoop.fs.file.impl", classOf[DebugFilesystem].getName) conf.set("spark.ui.enabled", "false") conf.set(SQLConf.SHUFFLE_PARTITIONS, 10) // reduce parallelism in tests - val sparkMajorVersion = - SPARK_VERSION.split("\\.").headOption.flatMap(s => Try(s.toInt).toOption).getOrElse(0) - conf.set(SQLConf.ANSI_ENABLED.key, (sparkMajorVersion >= 4).toString) + conf.set(SQLConf.ANSI_ENABLED.key, isSpark40Plus.toString) conf.set(SHUFFLE_MANAGER, shuffleManager) conf.set(MEMORY_OFFHEAP_ENABLED.key, "true") conf.set(MEMORY_OFFHEAP_SIZE.key, "2g") From 257a045d9c48f743121341806df450e39d3cec24 Mon Sep 17 00:00:00 2001 From: comphead Date: Tue, 19 May 2026 17:04:05 -0700 Subject: [PATCH 3/3] chore: enable ansi by default for Spark 4 tests --- .../test/scala/org/apache/spark/sql/CometTestBase.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala index e1a480647a..8f3b3bce27 100644 --- a/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala +++ b/spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala @@ -19,14 +19,15 @@ package org.apache.spark.sql -import org.apache.comet.CometSparkSessionExtensions.isSpark40Plus - import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.duration._ import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag import scala.util.{Success, Try} + import org.scalatest.BeforeAndAfterEach + import org.apache.hadoop.fs.Path import org.apache.parquet.column.ParquetProperties import org.apache.parquet.example.data.Group @@ -45,7 +46,9 @@ import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper import org.apache.spark.sql.internal._ import org.apache.spark.sql.test._ import org.apache.spark.sql.types.{DecimalType, StructType} + import org.apache.comet._ +import org.apache.comet.CometSparkSessionExtensions.isSpark40Plus import org.apache.comet.shims.ShimCometSparkSessionExtensions /**