Skip to content

Commit 0ab4107

Browse files
committed
[SPARK-55572][SQL][TESTS] Upgrade MySQL image to 9.6.0
### What changes were proposed in this pull request? This PR aims to upgrade `MySQL` image to `9.6.0` for Apache Spark 4.2.0. ### Why are the changes needed? To maintain our JDBC test coverage up-to-date by testing against the latest version of `MySQL`. - https://dev.mysql.com/doc/relnotes/mysql/9.6/en/ (2026-01-20) ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? Generated-by: `Gemini 3 Pro (High)` on `Antigravity` Closes #54346 from dongjoon-hyun/SPARK-55572. Authored-by: Dongjoon Hyun <dongjoon@apache.org> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent 07e9bea commit 0ab4107

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.spark.sql.jdbc
1919

2020
class MySQLDatabaseOnDocker extends DatabaseOnDocker {
21-
override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME", "mysql:9.2.0")
21+
override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME", "mysql:9.6.0")
2222
override val env = Map(
2323
"MYSQL_ROOT_PASSWORD" -> "rootpass"
2424
)

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ import org.apache.spark.sql.types.ShortType
3131
import org.apache.spark.tags.DockerTest
3232

3333
/**
34-
* To run this test suite for a specific version (e.g., mysql:9.2.0):
34+
* To run this test suite for a specific version (e.g., mysql:9.6.0):
3535
* {{{
36-
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
36+
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.6.0
3737
* ./build/sbt -Pdocker-integration-tests
3838
* "docker-integration-tests/testOnly org.apache.spark.sql.jdbc.MySQLIntegrationSuite"
3939
* }}}
@@ -364,9 +364,9 @@ class MySQLIntegrationSuite extends SharedJDBCIntegrationSuite {
364364

365365

366366
/**
367-
* To run this test suite for a specific version (e.g., mysql:9.2.0):
367+
* To run this test suite for a specific version (e.g., mysql:9.6.0):
368368
* {{{
369-
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
369+
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.6.0
370370
* ./build/sbt -Pdocker-integration-tests
371371
* "docker-integration-tests/testOnly *MySQLOverMariaConnectorIntegrationSuite"
372372
* }}}

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import org.apache.spark.sql.types._
2727
import org.apache.spark.tags.DockerTest
2828

2929
/**
30-
* To run this test suite for a specific version (e.g., mysql:9.2.0):
30+
* To run this test suite for a specific version (e.g., mysql:9.6.0):
3131
* {{{
32-
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
32+
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.6.0
3333
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLIntegrationSuite"
3434
* }}}
3535
*/
@@ -316,9 +316,9 @@ class MySQLIntegrationSuite extends DockerJDBCIntegrationV2Suite with V2JDBCTest
316316
}
317317

318318
/**
319-
* To run this test suite for a specific version (e.g., mysql:9.2.0):
319+
* To run this test suite for a specific version (e.g., mysql:9.6.0):
320320
* {{{
321-
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
321+
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.6.0
322322
* ./build/sbt -Pdocker-integration-tests
323323
* "docker-integration-tests/testOnly *MySQLOverMariaConnectorIntegrationSuite"
324324
* }}}

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
2828
import org.apache.spark.tags.DockerTest
2929

3030
/**
31-
* To run this test suite for a specific version (e.g., mysql:9.2.0):
31+
* To run this test suite for a specific version (e.g., mysql:9.6.0):
3232
* {{{
33-
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
33+
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.6.0
3434
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLNamespaceSuite"
3535
* }}}
3636
*/

connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/join/MySQLJoinPushdownIntegrationSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import org.apache.spark.sql.jdbc.v2.JDBCV2JoinPushdownIntegrationSuiteBase
2525
import org.apache.spark.tags.DockerTest
2626

2727
/**
28-
* To run this test suite for a specific version (e.g., mysql:9.2.0):
28+
* To run this test suite for a specific version (e.g., mysql:9.6.0):
2929
* {{{
30-
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
30+
* ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.6.0
3131
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MySQLIntegrationSuite"
3232
* }}}
3333
*/

0 commit comments

Comments
 (0)