Skip to content

test: run more Spark 4 tests #4013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kazuyukitanimura wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

test: run more Spark 4 tests #4013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions spark/src/test/scala/org/apache/comet/CometArrayExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,6 @@ class CometArrayExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelp
}

test("array_compact") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
Seq(true, false).foreach { dictionaryEnabled =>
withTempDir { dir =>
withTempView("t1") {
Expand Down
6 changes: 0 additions & 6 deletions spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2271,8 +2271,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}

test("to_json") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[StructsToJson]) -> "true") {
Seq(true, false).foreach { dictionaryEnabled =>
withParquetTable(
Expand All @@ -2298,8 +2296,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}

test("to_json escaping of field names and string values") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[StructsToJson]) -> "true") {
val gen = new DataGenerator(new Random(42))
val chars = "\\'\"abc\t\r\n\f\b"
Expand Down Expand Up @@ -2329,8 +2325,6 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
}

test("to_json unicode") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[StructsToJson]) -> "true") {
Seq(true, false).foreach { dictionaryEnabled =>
withParquetTable(
Expand Down
2 changes: 0 additions & 2 deletions spark/src/test/scala/org/apache/comet/CometJsonExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import org.apache.spark.sql.catalyst.expressions.{JsonToStructs, StructsToJson}
import org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
import org.apache.spark.sql.functions._

import org.apache.comet.CometSparkSessionExtensions.isSpark40Plus
import org.apache.comet.serde.CometStructsToJson
import org.apache.comet.testing.{DataGenOptions, ParquetGenerator, SchemaGenOptions}

Expand All @@ -48,7 +47,6 @@ class CometJsonExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
}

test("to_json - all supported types") {
assume(!isSpark40Plus)
withTempDir { dir =>
val path = new Path(dir.toURI.toString, "test.parquet")
val filename = path.toString
Expand Down
24 changes: 0 additions & 24 deletions spark/src/test/scala/org/apache/comet/exec/CometColumnarShuffleSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,78 +344,54 @@ abstract class CometColumnarShuffleSuite extends CometTestBase with AdaptiveSpar
}

test("columnar shuffle on map [bool]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(true, false))
}

test("columnar shuffle on map [byte]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toByte, 1.toByte))
}

test("columnar shuffle on map [short]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toShort, 1.toShort))
}

test("columnar shuffle on map [int]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0, 1))
}

test("columnar shuffle on map [long]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toLong, 1.toLong))
}

test("columnar shuffle on map [float]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toFloat, 1.toFloat))
}

test("columnar shuffle on map [double]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toDouble, 1.toDouble))
}

test("columnar shuffle on map [date]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(new java.sql.Date(0.toLong), new java.sql.Date(1.toLong)))
}

test("columnar shuffle on map [timestamp]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(
50,
Seq(new java.sql.Timestamp(0.toLong), new java.sql.Timestamp(1.toLong)))
}

test("columnar shuffle on map [decimal]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(
50,
Seq(new java.math.BigDecimal(0.toLong), new java.math.BigDecimal(1.toLong)))
}

test("columnar shuffle on map [string]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toString, 1.toString))
}

test("columnar shuffle on map [binary]") {
// https://github.com/apache/datafusion-comet/issues/1941
assume(!isSpark40Plus)
columnarShuffleOnMapTest(50, Seq(0.toString.getBytes(), 1.toString.getBytes()))
}

Expand Down
4 changes: 0 additions & 4 deletions spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,8 +2000,6 @@ class CometExecSuite extends CometTestBase {
}

test("SparkToColumnar eliminate redundant in AQE") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(
SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "true",
CometConf.COMET_SHUFFLE_MODE.key -> "jvm") {
Expand Down Expand Up @@ -2090,8 +2088,6 @@ class CometExecSuite extends CometTestBase {
}

test("SparkToColumnar override node name for row input") {
// TODO fix for Spark 4.0.0
assume(!isSpark40Plus)
withSQLConf(
SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "true",
CometConf.COMET_SHUFFLE_MODE.key -> "jvm") {
Expand Down
Loading