Skip to content

Commit ef99fe8

Browse files
test: Enable more Spark tests (#3905)
We should run Spark tests as much as possible
1 parent 67624a8 commit ef99fe8

3 files changed

Lines changed: 32 additions & 239 deletions

File tree

dev/diffs/3.4.3.diff

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,6 @@ index f33432ddb6f..7d758d2481f 100644
438438
case _ => Nil
439439
}
440440
}
441-
@@ -755,7 +759,8 @@ abstract class DynamicPartitionPruningSuiteBase
442-
}
443-
}
444-
445-
- test("partition pruning in broadcast hash joins") {
446-
+ test("partition pruning in broadcast hash joins",
447-
+ IgnoreComet("TODO: Support SubqueryBroadcastExec in Comet: #1737")) {
448-
Given("disable broadcast pruning and disable subquery duplication")
449-
withSQLConf(
450-
SQLConf.DYNAMIC_PARTITION_PRUNING_REUSE_BROADCAST_ONLY.key -> "true",
451441
@@ -1027,7 +1032,8 @@ abstract class DynamicPartitionPruningSuiteBase
452442
}
453443
}
@@ -956,48 +946,6 @@ index 525d97e4998..843f0472c23 100644
956946
AccumulatorSuite.verifyPeakExecutionMemorySet(sparkContext, "external sort") {
957947
sql("SELECT * FROM testData2 ORDER BY a ASC, b ASC").collect()
958948
}
959-
@@ -4429,7 +4430,8 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
960-
}
961-
962-
test("SPARK-39166: Query context of binary arithmetic should be serialized to executors" +
963-
- " when WSCG is off") {
964-
+ " when WSCG is off",
965-
+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/2215")) {
966-
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "false",
967-
SQLConf.ANSI_ENABLED.key -> "true") {
968-
withTable("t") {
969-
@@ -4450,7 +4452,8 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
970-
}
971-
972-
test("SPARK-39175: Query context of Cast should be serialized to executors" +
973-
- " when WSCG is off") {
974-
+ " when WSCG is off",
975-
+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/2215")) {
976-
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "false",
977-
SQLConf.ANSI_ENABLED.key -> "true") {
978-
withTable("t") {
979-
@@ -4467,14 +4470,19 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
980-
val msg = intercept[SparkException] {
981-
sql(query).collect()
982-
}.getMessage
983-
- assert(msg.contains(query))
984-
+ if (!isCometEnabled) {
985-
+ // Comet's error message does not include the original SQL query
986-
+ // https://github.com/apache/datafusion-comet/issues/2215
987-
+ assert(msg.contains(query))
988-
+ }
989-
}
990-
}
991-
}
992-
}
993-
994-
test("SPARK-39190,SPARK-39208,SPARK-39210: Query context of decimal overflow error should " +
995-
- "be serialized to executors when WSCG is off") {
996-
+ "be serialized to executors when WSCG is off",
997-
+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/2215")) {
998-
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "false",
999-
SQLConf.ANSI_ENABLED.key -> "true") {
1000-
withTable("t") {
1001949
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala
1002950
index 48ad10992c5..51d1ee65422 100644
1003951
--- a/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala

dev/diffs/3.5.8.diff

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -941,48 +941,6 @@ index 3cf2bfd17ab..49728c35c42 100644
941941
AccumulatorSuite.verifyPeakExecutionMemorySet(sparkContext, "external sort") {
942942
sql("SELECT * FROM testData2 ORDER BY a ASC, b ASC").collect()
943943
}
944-
@@ -4459,7 +4460,8 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
945-
}
946-
947-
test("SPARK-39166: Query context of binary arithmetic should be serialized to executors" +
948-
- " when WSCG is off") {
949-
+ " when WSCG is off",
950-
+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/2215")) {
951-
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "false",
952-
SQLConf.ANSI_ENABLED.key -> "true") {
953-
withTable("t") {
954-
@@ -4480,7 +4482,8 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
955-
}
956-
957-
test("SPARK-39175: Query context of Cast should be serialized to executors" +
958-
- " when WSCG is off") {
959-
+ " when WSCG is off",
960-
+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/2215")) {
961-
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "false",
962-
SQLConf.ANSI_ENABLED.key -> "true") {
963-
withTable("t") {
964-
@@ -4497,14 +4500,19 @@ class SQLQuerySuite extends QueryTest with SharedSparkSession with AdaptiveSpark
965-
val msg = intercept[SparkException] {
966-
sql(query).collect()
967-
}.getMessage
968-
- assert(msg.contains(query))
969-
+ if (!isCometEnabled) {
970-
+ // Comet's error message does not include the original SQL query
971-
+ // https://github.com/apache/datafusion-comet/issues/2215
972-
+ assert(msg.contains(query))
973-
+ }
974-
}
975-
}
976-
}
977-
}
978-
979-
test("SPARK-39190,SPARK-39208,SPARK-39210: Query context of decimal overflow error should " +
980-
- "be serialized to executors when WSCG is off") {
981-
+ "be serialized to executors when WSCG is off",
982-
+ IgnoreComet("https://github.com/apache/datafusion-comet/issues/2215")) {
983-
withSQLConf(SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "false",
984-
SQLConf.ANSI_ENABLED.key -> "true") {
985-
withTable("t") {
986944
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala
987945
index 8b4ac474f87..3f79f20822f 100644
988946
--- a/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionExtensionSuite.scala

0 commit comments

Comments
 (0)