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 550c2071bf8e [SPARK-49822][SQL][TESTS] Update postgres docker image to
17.0
550c2071bf8e is described below
commit 550c2071bf8e1e740e595ae9321ae11015d77917
Author: panbingkun <[email protected]>
AuthorDate: Sat Sep 28 16:23:06 2024 -0700
[SPARK-49822][SQL][TESTS] Update postgres docker image to 17.0
### What changes were proposed in this pull request?
This PR aims to update the `postgres` docker image from `16.3` to `17.0`.
### Why are the changes needed?
This will help Apache Spark test the latest postgres.
### 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 #48291 from panbingkun/SPARK-49822.
Authored-by: panbingkun <[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 +++---
6 files changed, 18 insertions(+), 18 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 3076b599ef4e..071b976f044c 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
@@ -32,9 +32,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:16.4-alpine):
+ * To run this test suite for a specific version (e.g., postgres:17.0-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:17.0-alpine
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly
org.apache.spark.sql.jdbc.PostgresIntegrationSuite"
* }}}
@@ -42,7 +42,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:16.4-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:17.0-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 5acb6423bbd9..62f9c6e0256f 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:16.4-alpine):
+ * To run this test suite for a specific version (e.g., postgres:17.0-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:17.0-alpine
* ./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:16.4-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:17.0-alpine")
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 8d367f476403..a79bbf39a71b 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:16.4-alpine):
+ * To run this test suite for a specific version (e.g., postgres:17.0-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:17.0-alpine
* ./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:16.4-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:17.0-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 f3a08541365c..80ba35df6c89 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:16.4-alpine):
+ * Note: To run this test suite for a specific version (e.g.,
postgres:17.0-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:17.0-alpine
* ./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:16.4-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:17.0-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 850391e8dc33..6bb415a92883 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:16.4-alpine)
+ * To run this test suite for a specific version (e.g., postgres:17.0-alpine)
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:17.0-alpine
* ./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:16.4-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:17.0-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 665746f1d577..6d4f1cc2fd3f 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:16.4-alpine):
+ * To run this test suite for a specific version (e.g., postgres:17.0-alpine):
* {{{
- * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:16.4-alpine
+ * ENABLE_DOCKER_INTEGRATION_TESTS=1
POSTGRES_DOCKER_IMAGE_NAME=postgres:17.0-alpine
* ./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:16.4-alpine")
+ override val imageName = sys.env.getOrElse("POSTGRES_DOCKER_IMAGE_NAME",
"postgres:17.0-alpine")
override val env = Map(
"POSTGRES_PASSWORD" -> "rootpass"
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]