Skip to content

Commit e6f7cc9

Browse files
committed
[SPARK-52277] Upgrade Docker tags to 4.0.0 instead of 4.0.0-preview2
### What changes were proposed in this pull request? This PR aims to use Spark docker image tag `4.0.0` instead of `4.0.0-preview2`. ### Why are the changes needed? To use the official one instead of the preview. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Manual review. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #171 from dongjoon-hyun/SPARK-52277. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent be54a9d commit e6f7cc9

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

.github/workflows/integration_test_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
SPARK_REMOTE: "sc://localhost:15003"
3232
services:
3333
spark:
34-
image: apache/spark:4.0.0-preview2
34+
image: apache/spark:4.0.0
3535
env:
3636
SPARK_NO_DAEMONIZE: 1
3737
ports:

Examples/app/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is an example Swift application to show how to use Apache Spark Connect Swi
77
Prepare `Spark Connect Server` via running Docker image.
88

99
```
10-
docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
10+
docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
1111
```
1212

1313
Build an application Docker image.
@@ -23,7 +23,7 @@ Run `app` docker image.
2323

2424
```
2525
$ docker run --rm -e SPARK_REMOTE=sc://host.docker.internal:15002 apache/spark-connect-swift:app
26-
Connected to Apache Spark 4.0.0-preview2 Server
26+
Connected to Apache Spark 4.0.0 Server
2727
EXECUTE: DROP TABLE IF EXISTS t
2828
EXECUTE: CREATE TABLE IF NOT EXISTS t(a INT) USING ORC
2929
EXECUTE: INSERT INTO t VALUES (1), (2), (3)
@@ -52,7 +52,7 @@ Run from source code.
5252
```
5353
$ swift run
5454
...
55-
Connected to Apache Spark 4.0.0-preview2 Server
55+
Connected to Apache Spark 4.0.0 Server
5656
EXECUTE: DROP TABLE IF EXISTS t
5757
EXECUTE: CREATE TABLE IF NOT EXISTS t(a INT) USING ORC
5858
EXECUTE: INSERT INTO t VALUES (1), (2), (3)

Examples/pi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is an example Swift application to show how to use Apache Spark Connect Swi
66

77
Prepare `Spark Connect Server` via running Docker image.
88
```
9-
docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
9+
docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
1010
```
1111

1212
Build an application Docker image.

Examples/spark-sql/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This is an example Swift application to show how to develop a Spark SQL REPL(Rea
77
Prepare `Spark Connect Server` via running Docker image.
88

99
```
10-
docker run -it --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
10+
docker run -it --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
1111
```
1212

1313
Build an application Docker image.
@@ -23,7 +23,7 @@ Run `spark-sql` docker image.
2323

2424
```
2525
$ docker run -it --rm -e SPARK_REMOTE=sc://host.docker.internal:15002 apache/spark-connect-swift:spark-sql
26-
Connected to Apache Spark 4.0.0-preview2 Server
26+
Connected to Apache Spark 4.0.0 Server
2727
spark-sql (default)> SHOW DATABASES;
2828
+---------+
2929
|namespace|

Examples/stream/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This is an example Swift stream processing application to show how to count word
55
## Run `Spark Connect Server`
66

77
```bash
8-
docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
8+
docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
99
```
1010

1111
## Run `Netcat` as a streaming input server

Examples/web/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ index 2edcc8f..22313c8 100644
7777
Prepare `Spark Connect Server` via running Docker image.
7878

7979
```
80-
docker run --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
80+
docker run --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait"
8181
```
8282

8383
Build an application Docker image.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
This is an experimental Swift library to show how to connect to a remote Apache Spark Connect Server and run SQL statements to manipulate remote data.
88

9-
So far, this library project is tracking the upstream changes like the [Apache Spark](https://spark.apache.org) 4.0.0 RC7 release and [Apache Arrow](https://arrow.apache.org) project's Swift-support.
9+
So far, this library project is tracking the upstream changes of [Apache Arrow](https://arrow.apache.org) project's Swift-support.
1010

1111
## Resources
1212

@@ -16,7 +16,7 @@ So far, this library project is tracking the upstream changes like the [Apache S
1616

1717
## Requirement
1818

19-
- [Apache Spark 4.0.0 RC7 (May 2025)](https://github.com/apache/spark/releases/tag/v4.0.0)
19+
- [Apache Spark 4.0.0 (May 2025)](https://github.com/apache/spark/releases/tag/v4.0.0)
2020
- [Swift 6.0 (2024) or 6.1 (2025)](https://swift.org)
2121
- [gRPC Swift 2.2 (May 2025)](https://github.com/grpc/grpc-swift/releases/tag/2.2.1)
2222
- [gRPC Swift Protobuf 1.3 (May 2025)](https://github.com/grpc/grpc-swift-protobuf/releases/tag/1.3.0)

Sources/SparkConnect/Documentation.docc/Examples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This document provides an overview of the example applications inside [Examples]
77
Start a Spark Connect Server:
88

99
```bash
10-
docker run -it --rm -p 15002:15002 apache/spark:4.0.0-preview2 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
10+
docker run -it --rm -p 15002:15002 apache/spark:4.0.0 bash -c "/opt/spark/sbin/start-connect-server.sh --wait -c spark.log.level=ERROR"
1111
```
1212

1313
## Basic Application Example
@@ -147,7 +147,7 @@ Welcome to the Swift world. Say hello!%
147147

148148
# Spark-powered endpoint
149149
curl http://127.0.0.1:8080/hello
150-
Hi, this is powered by the Apache Spark 4.0.0-preview2.%
150+
Hi, this is powered by the Apache Spark 4.0.0.%
151151
```
152152

153153
## Development Environment

0 commit comments

Comments
 (0)