Skip to content

Commit 94b572a

Browse files
wayneguowdongjoon-hyun
authored andcommitted
[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsSQLServer docker image tag to 2022-CU14-ubuntu-22.04
### What changes were proposed in this pull request? This PR aims to upgrade `mssql-jdbc` to 12.8.0.jre11 and MySQLServer docker image to `mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04`. ### Why are the changes needed? This is the latest stable version of `mssql-jdbc`, related release notes: https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.0 https://github.com/microsoft/mssql-jdbc/releases/tag/v12.7.1 https://github.com/microsoft/mssql-jdbc/releases/tag/v12.8.0 Some fixed issues: - Fix to ensure metadata returned follows JDBC data type specs microsoft/mssql-jdbc#2326 - Added token cache map to fix use of unintended auth token for subsequent connections microsoft/mssql-jdbc#2341 - Clear prepared statement handle before reconnect microsoft/mssql-jdbc#2364 - Reset socketTimeout to original value after a successful connection open microsoft/mssql-jdbc#2355 - Clear prepared statement cache when resetting statement pool connection microsoft/mssql-jdbc#2361 - Fixed ClassLoader leak of ActivityCorrelator ThreadLocal microsoft/mssql-jdbc#2366 ### 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 #47569 from wayneguow/ms_12_8. Authored-by: Wei Guo <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent 5f2d3b0 commit 94b572a

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

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

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

2020
class MsSQLServerDatabaseOnDocker extends DatabaseOnDocker {
2121
override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
22-
"mcr.microsoft.com/mssql/server:2022-CU12-GDR1-ubuntu-22.04")
22+
"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
2323
override val env = Map(
2424
"SA_PASSWORD" -> "Sapass123",
2525
"ACCEPT_EULA" -> "Y"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ import org.apache.spark.sql.types.{BinaryType, DecimalType}
3131
import org.apache.spark.tags.DockerTest
3232

3333
/**
34-
* To run this test suite for a specific version (e.g., 2019-CU13-ubuntu-20.04):
34+
* To run this test suite for a specific version (e.g., 2022-CU14-ubuntu-22.04):
3535
* {{{
3636
* ENABLE_DOCKER_INTEGRATION_TESTS=1
37-
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
37+
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
3838
* ./build/sbt -Pdocker-integration-tests
3939
* "docker-integration-tests/testOnly org.apache.spark.sql.jdbc.MsSqlServerIntegrationSuite"
4040
* }}}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ 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., 2019-CU13-ubuntu-20.04):
30+
* To run this test suite for a specific version (e.g., 2022-CU14-ubuntu-22.04):
3131
* {{{
3232
* ENABLE_DOCKER_INTEGRATION_TESTS=1
33-
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
33+
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
3434
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MsSqlServerIntegrationSuite"
3535
* }}}
3636
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
2626
import org.apache.spark.tags.DockerTest
2727

2828
/**
29-
* To run this test suite for a specific version (e.g., 2019-CU13-ubuntu-20.04):
29+
* To run this test suite for a specific version (e.g., 2022-CU14-ubuntu-22.04):
3030
* {{{
3131
* ENABLE_DOCKER_INTEGRATION_TESTS=1
32-
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
32+
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
3333
* ./build/sbt -Pdocker-integration-tests "testOnly *v2.MsSqlServerNamespaceSuite"
3434
* }}}
3535
*/

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
<mysql.connector.version>9.0.0</mysql.connector.version>
327327
<postgresql.version>42.7.3</postgresql.version>
328328
<db2.jcc.version>11.5.9.0</db2.jcc.version>
329-
<mssql.jdbc.version>12.6.3.jre11</mssql.jdbc.version>
329+
<mssql.jdbc.version>12.8.0.jre11</mssql.jdbc.version>
330330
<ojdbc11.version>23.4.0.24.05</ojdbc11.version>
331331
</properties>
332332
<repositories>

0 commit comments

Comments
 (0)