This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 56c78792a69b [SPARK-51145][BUILD][TESTS] Upgrade `mysql-connector-j`,
`MySQL` docker image version to 9.2.0 and `MariaDB` docker image version to
11.4.5
56c78792a69b is described below
commit 56c78792a69bdf0b9cee0c030c7beed2ad74fee5
Author: Wei Guo <[email protected]>
AuthorDate: Mon Feb 10 12:25:12 2025 -0800
[SPARK-51145][BUILD][TESTS] Upgrade `mysql-connector-j`, `MySQL` docker
image version to 9.2.0 and `MariaDB` docker image version to 11.4.5
### What changes were proposed in this pull request?
This PR aims to upgrade:
- `mysql-connector-j`, `MySQL` docker image version from 9.1.0 to 9.2.0
- `MariaDB` docker image version from 10.11.10 to 11.4.5
### Why are the changes needed?
Tests dependencies upgrading, and there are some bug fixes in
`mysql-connector-j`, full release notes:
https://dev.mysql.com/doc/relnotes/connector-j/en/news-9-2-0.html
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass GA.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #49864 from wayneguow/mysql.
Authored-by: Wei Guo <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../src/test/resources/mariadb-docker-entrypoint.sh | 2 +-
.../src/test/resources/mariadb-krb-setup.sh | 4 ++--
.../scala/org/apache/spark/sql/jdbc/MariaDBDatabaseOnDocker.scala | 2 +-
.../org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala | 4 ++--
.../scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala | 2 +-
.../scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala | 8 ++++----
.../org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala | 8 ++++----
.../scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala | 4 ++--
pom.xml | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/connector/docker-integration-tests/src/test/resources/mariadb-docker-entrypoint.sh
b/connector/docker-integration-tests/src/test/resources/mariadb-docker-entrypoint.sh
index ab7d967a927d..41668fb1acf4 100755
---
a/connector/docker-integration-tests/src/test/resources/mariadb-docker-entrypoint.sh
+++
b/connector/docker-integration-tests/src/test/resources/mariadb-docker-entrypoint.sh
@@ -23,4 +23,4 @@ echo "Installing $GSSAPI_PLUGIN"
apt install -y "$GSSAPI_PLUGIN"
echo "gssapi_keytab_path=/docker-entrypoint-initdb.d/mariadb.keytab" >>
/etc/mysql/mariadb.conf.d/auth_gssapi.cnf
echo "gssapi_principal_name=mariadb/[email protected]" >>
/etc/mysql/mariadb.conf.d/auth_gssapi.cnf
-docker-entrypoint.sh mysqld
+docker-entrypoint.sh mariadbd
diff --git
a/connector/docker-integration-tests/src/test/resources/mariadb-krb-setup.sh
b/connector/docker-integration-tests/src/test/resources/mariadb-krb-setup.sh
index e97be805b459..076c3b1c1103 100755
--- a/connector/docker-integration-tests/src/test/resources/mariadb-krb-setup.sh
+++ b/connector/docker-integration-tests/src/test/resources/mariadb-krb-setup.sh
@@ -16,5 +16,5 @@
# limitations under the License.
#
-mysql -u root -p'rootpass' -e 'CREATE USER
"mariadb/[email protected]" IDENTIFIED WITH gssapi;'
-mysql -u root -p'rootpass' -D mysql -e 'GRANT ALL PRIVILEGES ON *.* TO
"mariadb/[email protected]";'
+mariadb -u root -p'rootpass' -e 'CREATE USER
"mariadb/[email protected]" IDENTIFIED WITH gssapi;'
+mariadb -u root -p'rootpass' -D mysql -e 'GRANT ALL PRIVILEGES ON *.* TO
"mariadb/[email protected]";'
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBDatabaseOnDocker.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBDatabaseOnDocker.scala
index 61930268eb2a..6ad8342d032b 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBDatabaseOnDocker.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBDatabaseOnDocker.scala
@@ -21,7 +21,7 @@ import org.apache.spark.internal.Logging
abstract class MariaDBDatabaseOnDocker extends DatabaseOnDocker with Logging {
override val imageName: String =
- sys.env.getOrElse("MARIADB_DOCKER_IMAGE_NAME", "mariadb:10.11.10")
+ sys.env.getOrElse("MARIADB_DOCKER_IMAGE_NAME", "mariadb:11.4.5")
override val env: Map[String, String] = Map(
"MYSQL_ROOT_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
index 962c70510b5b..4f782bed7792 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MariaDBKrbIntegrationSuite.scala
@@ -25,9 +25,9 @@ import
org.apache.spark.sql.execution.datasources.jdbc.connection.SecureConnecti
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mariadb:10.6.19):
+ * To run this test suite for a specific version (e.g., mariadb:11.4.5):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
MARIADB_DOCKER_IMAGE_NAME=mariadb:10.6.19
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MARIADB_DOCKER_IMAGE_NAME=mariadb:11.4.5
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.MariaDBKrbIntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
index d5b61d479af1..0a8f263802b8 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLDatabaseOnDocker.scala
@@ -18,7 +18,7 @@
package org.apache.spark.sql.jdbc
class MySQLDatabaseOnDocker extends DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME",
"mysql:9.1.0")
+ override val imageName = sys.env.getOrElse("MYSQL_DOCKER_IMAGE_NAME",
"mysql:9.2.0")
override val env = Map(
"MYSQL_ROOT_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
index deeb52267a14..7244c5547abb 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MySQLIntegrationSuite.scala
@@ -31,9 +31,9 @@ import org.apache.spark.sql.types.ShortType
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mysql:9.1.0):
+ * To run this test suite for a specific version (e.g., mysql:9.2.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.MySQLIntegrationSuite"
* }}}
@@ -364,9 +364,9 @@ class MySQLIntegrationSuite extends
DockerJDBCIntegrationSuite {
/**
- * To run this test suite for a specific version (e.g., mysql:9.1.0):
+ * To run this test suite for a specific version (e.g., mysql:9.2.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
*MySQLOverMariaConnectorIntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
index 9c07ce939fe3..4733af882257 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLIntegrationSuite.scala
@@ -27,9 +27,9 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mysql:9.1.0):
+ * To run this test suite for a specific version (e.g., mysql:9.2.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2*MySQLIntegrationSuite"
* }}}
*/
@@ -244,9 +244,9 @@ class MySQLIntegrationSuite extends
DockerJDBCIntegrationV2Suite with V2JDBCTest
}
/**
- * To run this test suite for a specific version (e.g., mysql:9.1.0):
+ * To run this test suite for a specific version (e.g., mysql:9.2.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
*MySQLOverMariaConnectorIntegrationSuite"
* }}}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
index 5db1b9f863ad..e162abd98779 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MySQLNamespaceSuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., mysql:9.1.0):
+ * To run this test suite for a specific version (e.g., mysql:9.2.0):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.1.0
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 MYSQL_DOCKER_IMAGE_NAME=mysql:9.2.0
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2*MySQLNamespaceSuite"
* }}}
*/
diff --git a/pom.xml b/pom.xml
index c2b2152a6a6b..62d80af94d6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,7 +329,7 @@
-Dio.netty.tryReflectionSetAccessible=true
</extraJavaTestArgs>
<mariadb.java.client.version>2.7.12</mariadb.java.client.version>
- <mysql.connector.version>9.1.0</mysql.connector.version>
+ <mysql.connector.version>9.2.0</mysql.connector.version>
<postgresql.version>42.7.5</postgresql.version>
<db2.jcc.version>11.5.9.0</db2.jcc.version>
<mssql.jdbc.version>12.8.1.jre11</mssql.jdbc.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
