Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/pr_build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,27 +169,27 @@ jobs:
- name: "Spark 3.5.5, JDK 17, Scala 2.13"
java_version: "17"
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.5 -Pscala-2.13"
scan_impl: "native_comet"
scan_impl: "auto"

- name: "Spark 3.5.6, JDK 17, Scala 2.13"
java_version: "17"
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.6 -Pscala-2.13"
scan_impl: "native_comet"

- name: "Spark 3.5, JDK 17, Scala 2.12 native_datafusion"
- name: "Spark 3.5, JDK 17, Scala 2.12"
java_version: "17"
maven_opts: "-Pspark-3.5 -Pscala-2.12"
scan_impl: "native_datafusion"

- name: "Spark 3.5, JDK 17, Scala 2.12 native_iceberg_compat"
- name: "Spark 3.5, JDK 17, Scala 2.12"
java_version: "17"
maven_opts: "-Pspark-3.5 -Pscala-2.12"
scan_impl: "native_iceberg_compat"

- name: "Spark 4.0, JDK 17"
java_version: "17"
maven_opts: "-Pspark-4.0"
scan_impl: "native_comet"
scan_impl: "auto"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have only been testing Spark 4 with the native_comet scan as the default 🤦

suite:
- name: "fuzz"
value: |
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
value: |
org.apache.spark.sql.CometToPrettyStringSuite
fail-fast: false
name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name }}]
name: ${{ matrix.os }}/${{ matrix.profile.name }}/${{ matrix.profile.scan_impl }} [${{ matrix.suite.name }}]
runs-on: ${{ matrix.os }}
container:
image: amd64/rust
Expand Down
17 changes: 5 additions & 12 deletions spark/src/test/scala/org/apache/comet/CometFuzzTestBase.scala
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,11 @@ class CometFuzzTestBase extends CometTestBase with AdaptiveSparkPlanHelper {
override protected def test(testName: String, testTags: Tag*)(testFun: => Any)(implicit
pos: Position): Unit = {
Seq("native", "jvm").foreach { shuffleMode =>
Seq(
CometConf.SCAN_AUTO,
CometConf.SCAN_NATIVE_COMET,
CometConf.SCAN_NATIVE_DATAFUSION,
CometConf.SCAN_NATIVE_ICEBERG_COMPAT).foreach { scanImpl =>
super.test(testName + s" ($scanImpl, $shuffleMode shuffle)", testTags: _*) {
withSQLConf(
CometConf.COMET_NATIVE_SCAN_IMPL.key -> scanImpl,
CometConf.COMET_PARQUET_UNSIGNED_SMALL_INT_CHECK.key -> "false",
CometConf.COMET_SHUFFLE_MODE.key -> shuffleMode) {
testFun
}
super.test(testName + s" ($shuffleMode shuffle)", testTags: _*) {
withSQLConf(
CometConf.COMET_PARQUET_UNSIGNED_SMALL_INT_CHECK.key -> "false",
CometConf.COMET_SHUFFLE_MODE.key -> shuffleMode) {
testFun
}
}
}
Expand Down
Loading