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 6e6197073a57 [SPARK-47111][SQL][TESTS] Upgrade `PostgreSQL` JDBC
driver to 42.7.2 and docker image to 16.2
6e6197073a57 is described below
commit 6e6197073a57a40502f12e9fc0cfd8f2d5f84585
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Tue Feb 20 19:49:44 2024 -0800
[SPARK-47111][SQL][TESTS] Upgrade `PostgreSQL` JDBC driver to 42.7.2 and
docker image to 16.2
### What changes were proposed in this pull request?
This PR aims to upgrade `PostgreSQL` JDBC driver and docker images.
- JDBC Driver: `org.postgresql:postgresql` from 42.7.0 to 42.7.2
- Docker Image: `postgres` from `15.1-alpine` to `16.2-alpine`
### Why are the changes needed?
To use the latest PostgreSQL combination in the following integration tests.
- PostgresIntegrationSuite
- PostgresKrbIntegrationSuite
- GeneratedSubquerySuite
- PostgreSQLQueryTestSuite
- v2/PostgresIntegrationSuite
- v2/PostgresNamespaceSuite
### Does this PR introduce _any_ user-facing change?
No. This is a pure test-environment update.
### How was this patch tested?
Pass the CIs.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #45191 from dongjoon-hyun/SPARK-47111.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala | 6 +++---
.../org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala | 6 +++---
.../apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala | 6 +++---
.../apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala | 6 +++---
.../org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala | 6 +++---
.../scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala | 6 +++---
pom.xml | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
index 92d1c3761ba8..968ca09cb3d5 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala
@@ -30,9 +30,9 @@ import org.apache.spark.sql.types.{ArrayType, DecimalType,
FloatType, ShortType}
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:15.1):
+ * To run this test suite for a specific version (e.g., postgres:16.2):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:15.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:16.2
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.PostgresIntegrationSuite"
* }}}
@@ -40,7 +40,7 @@ import org.apache.spark.tags.DockerTest
@DockerTest
class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite {
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:15.1-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.2-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
index 92c3378b4065..d08be3b5f40e 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresKrbIntegrationSuite.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., postgres:15.1):
+ * To run this test suite for a specific version (e.g., postgres:16.2):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:15.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:16.2
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly *PostgresKrbIntegrationSuite"
* }}}
@@ -38,7 +38,7 @@ class PostgresKrbIntegrationSuite extends
DockerKrbJDBCIntegrationSuite {
override protected val keytabFileName = "postgres.keytab"
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:15.1")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.2")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
index ff1afbd16865..7ae03e974845 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/GeneratedSubquerySuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.tags.DockerTest
/**
* This suite is used to generate subqueries, and test Spark against Postgres.
- * To run this test suite for a specific version (e.g., postgres:15.1):
+ * To run this test suite for a specific version (e.g., postgres:16.2):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:15.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:16.2
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.GeneratedSubquerySuite"
* }}}
@@ -39,7 +39,7 @@ import org.apache.spark.tags.DockerTest
class GeneratedSubquerySuite extends DockerJDBCIntegrationSuite with
QueryGeneratorHelper {
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:15.1-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.2-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
index 16ca831c56f2..f2a7e14cfc4b 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/querytest/PostgreSQLQueryTestSuite.scala
@@ -30,9 +30,9 @@ import org.apache.spark.tags.DockerTest
* confidence, and you won't have to manually verify the golden files
generated with your test.
* 2. Add this line to your .sql file: --ONLY_IF spark
*
- * Note: To run this test suite for a specific version (e.g., postgres:15.1):
+ * Note: To run this test suite for a specific version (e.g., postgres:16.2):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:15.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:16.2
* ./build/sbt -Pdocker-integration-tests
* "testOnly org.apache.spark.sql.jdbc.PostgreSQLQueryTestSuite"
* }}}
@@ -45,7 +45,7 @@ class PostgreSQLQueryTestSuite extends
CrossDbmsQueryTestSuite {
protected val customInputFilePath: String = new File(inputFilePath,
"subquery").getAbsolutePath
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:15.1-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.2-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
index 85e85f8bf380..233a634cac67 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresIntegrationSuite.scala
@@ -28,9 +28,9 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:15.1):
+ * To run this test suite for a specific version (e.g., postgres:16.2)
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:15.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:16.2
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2.PostgresIntegrationSuite"
* }}}
*/
@@ -38,7 +38,7 @@ import org.apache.spark.tags.DockerTest
class PostgresIntegrationSuite extends DockerJDBCIntegrationV2Suite with
V2JDBCTest {
override val catalogName: String = "postgresql"
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:15.1-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.2-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
index 980e0a1ec7e6..838de5acab0d 100644
---
a/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
+++
b/connector/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/PostgresNamespaceSuite.scala
@@ -26,16 +26,16 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest
/**
- * To run this test suite for a specific version (e.g., postgres:15.1):
+ * To run this test suite for a specific version (e.g., postgres:16.2):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:15.1
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1 POSTGRES_DOCKER_IMAGE_NAME=postgres:16.2
* ./build/sbt -Pdocker-integration-tests "testOnly
*v2.PostgresNamespaceSuite"
* }}}
*/
@DockerTest
class PostgresNamespaceSuite extends DockerJDBCIntegrationSuite with
V2JDBCNamespaceTest {
override val db = new DatabaseOnDocker {
- override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:15.1-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:16.2-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
diff --git a/pom.xml b/pom.xml
index b56fb857ee46..2e1eb8f3bbb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1255,7 +1255,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>42.7.0</version>
+ <version>42.7.2</version>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
