This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new a49d6f42f598 [SPARK-47949][SQL][DOCKER][TESTS] MsSQLServer: Bump up
mssql docker image version to 2022-CU12-GDR1-ubuntu-22.04
a49d6f42f598 is described below
commit a49d6f42f598c15e3394baa15fa6d083c241a8f4
Author: Kent Yao <[email protected]>
AuthorDate: Tue Apr 23 07:44:15 2024 -0700
[SPARK-47949][SQL][DOCKER][TESTS] MsSQLServer: Bump up mssql docker image
version to 2022-CU12-GDR1-ubuntu-22.04
### What changes were proposed in this pull request?
This PR umps up mssql docker image version to 2022-CU12-GDR1-ubuntu-22.04
FYI, https://mcr.microsoft.com/en-us/product/mssql/server/tags
### Why are the changes needed?
dependency mgr
### Does this PR introduce _any_ user-facing change?
no
### How was this patch tested?
existing tests
### Was this patch authored or co-authored using generative AI tooling?
no
Closes #46176 from yaooqinn/SPARK-47949.
Authored-by: Kent Yao <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
(cherry picked from commit 9c4f12ca04ac36ab6e23c0a896266b3a25e6d05d)
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../sql/jdbc/MsSQLServerDatabaseOnDocker.scala | 32 ++++++++++++++++++++++
.../sql/jdbc/MsSqlServerIntegrationSuite.scala | 14 +---------
.../sql/jdbc/v2/MsSqlServerIntegrationSuite.scala | 16 ++---------
.../sql/jdbc/v2/MsSqlServerNamespaceSuite.scala | 17 ++----------
4 files changed, 37 insertions(+), 42 deletions(-)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSQLServerDatabaseOnDocker.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSQLServerDatabaseOnDocker.scala
new file mode 100644
index 000000000000..b351b2ad1ec7
--- /dev/null
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSQLServerDatabaseOnDocker.scala
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.jdbc
+
+class MsSQLServerDatabaseOnDocker extends DatabaseOnDocker {
+ override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
+ "mcr.microsoft.com/mssql/server:2022-CU12-GDR1-ubuntu-22.04")
+ override val env = Map(
+ "SA_PASSWORD" -> "Sapass123",
+ "ACCEPT_EULA" -> "Y"
+ )
+ override val usesIpc = false
+ override val jdbcPort: Int = 1433
+
+ override def getJdbcUrl(ip: String, port: Int): String =
+ s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
+}
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
index f2614f46bc3f..443000050a47 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
@@ -38,19 +38,7 @@ import org.apache.spark.tags.DockerTest
*/
@DockerTest
class MsSqlServerIntegrationSuite extends DockerJDBCIntegrationSuite {
- override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
- "mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04")
- override val env = Map(
- "SA_PASSWORD" -> "Sapass123",
- "ACCEPT_EULA" -> "Y"
- )
- override val usesIpc = false
- override val jdbcPort: Int = 1433
-
- override def getJdbcUrl(ip: String, port: Int): String =
- s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
- }
+ override val db = new MsSQLServerDatabaseOnDocker
override def dataPreparation(conn: Connection): Unit = {
conn.prepareStatement("CREATE TABLE tbl (x INT, y VARCHAR
(50))").executeUpdate()
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
index 0bb2ea8249b3..de8fcf1a4a78 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
@@ -24,7 +24,7 @@ import org.scalatest.time.SpanSugar._
import org.apache.spark.{SparkConf, SparkSQLFeatureNotSupportedException}
import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.execution.datasources.v2.jdbc.JDBCTableCatalog
-import org.apache.spark.sql.jdbc.DatabaseOnDocker
+import org.apache.spark.sql.jdbc.MsSQLServerDatabaseOnDocker
import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
@@ -60,19 +60,7 @@ class MsSqlServerIntegrationSuite extends
DockerJDBCIntegrationV2Suite with V2JD
"scan with aggregate push-down: REGR_SXY without DISTINCT")
override val catalogName: String = "mssql"
- override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
- "mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04")
- override val env = Map(
- "SA_PASSWORD" -> "Sapass123",
- "ACCEPT_EULA" -> "Y"
- )
- override val usesIpc = false
- override val jdbcPort: Int = 1433
-
- override def getJdbcUrl(ip: String, port: Int): String =
- s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
- }
+ override val db = new MsSQLServerDatabaseOnDocker
override def sparkConf: SparkConf = super.sparkConf
.set("spark.sql.catalog.mssql", classOf[JDBCTableCatalog].getName)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerNamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerNamespaceSuite.scala
index b0a2d37e465a..de0ae5d59716 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerNamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerNamespaceSuite.scala
@@ -21,7 +21,7 @@ import java.sql.Connection
import scala.collection.JavaConverters._
-import org.apache.spark.sql.jdbc.{DatabaseOnDocker, DockerJDBCIntegrationSuite}
+import org.apache.spark.sql.jdbc.{DockerJDBCIntegrationSuite,
MsSQLServerDatabaseOnDocker}
import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest
@@ -35,20 +35,7 @@ import org.apache.spark.tags.DockerTest
*/
@DockerTest
class MsSqlServerNamespaceSuite extends DockerJDBCIntegrationSuite with
V2JDBCNamespaceTest {
- override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
- "mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04")
- override val env = Map(
- "SA_PASSWORD" -> "Sapass123",
- "ACCEPT_EULA" -> "Y"
- )
- override val usesIpc = false
- override val jdbcPort: Int = 1433
-
- override def getJdbcUrl(ip: String, port: Int): String =
- s"jdbc:sqlserver://$ip:$port;user=sa;password=Sapass123;"
- }
-
+ override val db = new MsSQLServerDatabaseOnDocker
val map = new CaseInsensitiveStringMap(
Map("url" -> db.getJdbcUrl(dockerIp, externalPort),
"driver" -> "com.microsoft.sqlserver.jdbc.SQLServerDriver").asJava)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
