Skip to content

Commit 6eaf948

Browse files
authored
chore: Bump Spark from 3.5.7 to 3.5.8 (#3323)
1 parent 313cf64 commit 6eaf948

9 files changed

Lines changed: 17 additions & 16 deletions

File tree

.github/actions/setup-spark-builder/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ inputs:
2222
description: 'The Apache Spark short version (e.g., 3.5) to build'
2323
required: true
2424
spark-version:
25-
description: 'The Apache Spark version (e.g., 3.5.7) to build'
25+
description: 'The Apache Spark version (e.g., 3.5.8) to build'
2626
required: true
2727
skip-native-build:
2828
description: 'Skip native build (when using pre-built artifact)'

.github/workflows/iceberg_spark_test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
os: [ubuntu-24.04]
5454
java-version: [11, 17]
5555
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
56-
spark-version: [{short: '3.5', full: '3.5.7'}]
56+
spark-version: [{short: '3.5', full: '3.5.8'}]
5757
scala-version: ['2.13']
5858
fail-fast: false
5959
name: iceberg-spark/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -92,7 +92,7 @@ jobs:
9292
os: [ubuntu-24.04]
9393
java-version: [11, 17]
9494
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
95-
spark-version: [{short: '3.5', full: '3.5.7'}]
95+
spark-version: [{short: '3.5', full: '3.5.8'}]
9696
scala-version: ['2.13']
9797
fail-fast: false
9898
name: iceberg-spark-extensions/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -131,7 +131,7 @@ jobs:
131131
os: [ubuntu-24.04]
132132
java-version: [11, 17]
133133
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
134-
spark-version: [{short: '3.5', full: '3.5.7'}]
134+
spark-version: [{short: '3.5', full: '3.5.8'}]
135135
scala-version: ['2.13']
136136
fail-fast: false
137137
name: iceberg-spark-runtime/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -170,7 +170,7 @@ jobs:
170170
os: [ubuntu-24.04]
171171
java-version: [11, 17]
172172
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
173-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
173+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
174174
scala-version: ['2.13']
175175
fail-fast: false
176176
name: iceberg-spark-rust/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -209,7 +209,7 @@ jobs:
209209
os: [ubuntu-24.04]
210210
java-version: [11, 17]
211211
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
212-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
212+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
213213
scala-version: ['2.13']
214214
fail-fast: false
215215
name: iceberg-spark-extensions-rust/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -248,7 +248,7 @@ jobs:
248248
os: [ubuntu-24.04]
249249
java-version: [11, 17]
250250
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}, {short: '1.10', full: '1.10.0'}]
251-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
251+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
252252
scala-version: ['2.13']
253253
fail-fast: false
254254
name: iceberg-spark-runtime-rust/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}

.github/workflows/spark_sql_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ jobs:
120120
# - native_iceberg_compat: Spark 3.5 only
121121
config:
122122
- {spark-short: '3.4', spark-full: '3.4.3', java: 11, scan-impl: 'auto', scan-env: ''}
123-
- {spark-short: '3.5', spark-full: '3.5.7', java: 11, scan-impl: 'auto', scan-env: ''}
123+
- {spark-short: '3.5', spark-full: '3.5.8', java: 11, scan-impl: 'auto', scan-env: ''}
124124
- {spark-short: '4.0', spark-full: '4.0.1', java: 17, scan-impl: 'auto', scan-env: ''}
125125
- {spark-short: '3.4', spark-full: '3.4.3', java: 11, scan-impl: 'native_comet', scan-env: 'COMET_PARQUET_SCAN_IMPL=native_comet'}
126-
- {spark-short: '3.5', spark-full: '3.5.7', java: 11, scan-impl: 'native_comet', scan-env: 'COMET_PARQUET_SCAN_IMPL=native_comet'}
127-
- {spark-short: '3.5', spark-full: '3.5.7', java: 11, scan-impl: 'native_iceberg_compat', scan-env: 'COMET_PARQUET_SCAN_IMPL=native_iceberg_compat'}
126+
- {spark-short: '3.5', spark-full: '3.5.8', java: 11, scan-impl: 'native_comet', scan-env: 'COMET_PARQUET_SCAN_IMPL=native_comet'}
127+
- {spark-short: '3.5', spark-full: '3.5.8', java: 11, scan-impl: 'native_iceberg_compat', scan-env: 'COMET_PARQUET_SCAN_IMPL=native_iceberg_compat'}
128128
# Skip sql_hive-1 for Spark 4.0 due to https://github.com/apache/datafusion-comet/issues/2946
129129
exclude:
130130
- config: {spark-short: '4.0', spark-full: '4.0.1', java: 17, scan-impl: 'auto', scan-env: ''}

.github/workflows/spark_sql_test_native_datafusion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
matrix:
3636
os: [ubuntu-24.04]
3737
java-version: [11]
38-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
38+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
3939
module:
4040
- {name: "catalyst", args1: "catalyst/test", args2: ""}
4141
- {name: "sql/core-1", args1: "", args2: sql/testOnly * -- -l org.apache.spark.tags.ExtendedSQLTest -l org.apache.spark.tags.SlowSQLTest}

.github/workflows/spark_sql_test_native_iceberg_compat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
matrix:
3636
os: [ubuntu-24.04]
3737
java-version: [11]
38-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
38+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.8'}]
3939
module:
4040
- {name: "catalyst", args1: "catalyst/test", args2: ""}
4141
- {name: "sql/core-1", args1: "", args2: sql/testOnly * -- -l org.apache.spark.tags.ExtendedSQLTest -l org.apache.spark.tags.SlowSQLTest}

docs/source/user-guide/latest/installation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Other versions may work well enough for development and evaluation purposes.
4141
| 3.5.5 | 11/17 | 2.12/2.13 | Yes | No |
4242
| 3.5.6 | 11/17 | 2.12/2.13 | Yes | No |
4343
| 3.5.7 | 11/17 | 2.12/2.13 | Yes | Yes |
44+
| 3.5.8 | 11/17 | 2.12/2.13 | Yes | Yes |
4445

4546
Note that we do not test the full matrix of supported Java and Scala versions in CI for every Spark version.
4647

kube/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616
#
1717

18-
FROM apache/spark:3.5.7 AS builder
18+
FROM apache/spark:3.5.8 AS builder
1919

2020
USER root
2121

@@ -70,7 +70,7 @@ RUN mkdir -p /root/.m2 && \
7070
RUN cd /comet \
7171
&& JAVA_HOME=$(readlink -f $(which javac) | sed "s/\/bin\/javac//") make release-nogit PROFILES="-Pspark-$SPARK_VERSION -Pscala-$SCALA_VERSION"
7272

73-
FROM apache/spark:3.5.7
73+
FROM apache/spark:3.5.8
7474
ENV SPARK_VERSION=3.5
7575
ENV SCALA_VERSION=2.12
7676
USER root

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ under the License.
7070
<scala.plugin.version>4.9.6</scala.plugin.version>
7171
<scalatest.version>3.2.16</scalatest.version>
7272
<scalatest-maven-plugin.version>2.2.0</scalatest-maven-plugin.version>
73-
<spark.version>3.5.7</spark.version>
73+
<spark.version>3.5.8</spark.version>
7474
<spark.version.short>3.5</spark.version.short>
7575
<spark.maven.scope>provided</spark.maven.scope>
7676
<protobuf.version>3.25.5</protobuf.version>
@@ -619,7 +619,7 @@ under the License.
619619
<id>spark-3.5</id>
620620
<properties>
621621
<scala.version>2.12.18</scala.version>
622-
<spark.version>3.5.7</spark.version>
622+
<spark.version>3.5.8</spark.version>
623623
<spark.version.short>3.5</spark.version.short>
624624
<parquet.version>1.13.1</parquet.version>
625625
<slf4j.version>2.0.7</slf4j.version>

0 commit comments

Comments
 (0)