Skip to content

Commit 991e72d

Browse files
authored
chore: Bump Spark from 3.5.6 to 3.5.7 (#2574)
1 parent 1e9ced5 commit 991e72d

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

.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.6) to build'
25+
description: 'The Apache Spark version (e.g., 3.5.7) to build'
2626
required: true
2727
runs:
2828
using: "composite"

.github/workflows/iceberg_spark_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
os: [ubuntu-24.04]
4848
java-version: [11, 17]
4949
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}]
50-
spark-version: [{short: '3.5', full: '3.5.6'}]
50+
spark-version: [{short: '3.5', full: '3.5.7'}]
5151
scala-version: ['2.13']
5252
fail-fast: false
5353
name: iceberg-spark/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -86,7 +86,7 @@ jobs:
8686
os: [ubuntu-24.04]
8787
java-version: [11, 17]
8888
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}]
89-
spark-version: [{short: '3.5', full: '3.5.6'}]
89+
spark-version: [{short: '3.5', full: '3.5.7'}]
9090
scala-version: ['2.13']
9191
fail-fast: false
9292
name: iceberg-spark-extensions/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -125,7 +125,7 @@ jobs:
125125
os: [ubuntu-24.04]
126126
java-version: [11, 17]
127127
iceberg-version: [{short: '1.8', full: '1.8.1'}, {short: '1.9', full: '1.9.1'}]
128-
spark-version: [{short: '3.5', full: '3.5.6'}]
128+
spark-version: [{short: '3.5', full: '3.5.7'}]
129129
scala-version: ['2.13']
130130
fail-fast: false
131131
name: iceberg-spark-runtime/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
@@ -155,4 +155,4 @@ jobs:
155155
rm -rf /root/.m2/repository/org/apache/parquet # somehow parquet cache requires cleanups
156156
ENABLE_COMET=true ENABLE_COMET_ONHEAP=true ./gradlew -DsparkVersions=${{ matrix.spark-version.short }} -DscalaVersion=${{ matrix.scala-version }} -DflinkVersions= -DkafkaVersions= \
157157
:iceberg-spark:iceberg-spark-runtime-${{ matrix.spark-version.short }}_${{ matrix.scala-version }}:integrationTest \
158-
-Pquick=true -x javadoc
158+
-Pquick=true -x javadoc

.github/workflows/pr_build_linux.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ jobs:
7474
maven_opts: "-Pspark-3.4 -Pscala-2.12"
7575
scan_impl: "native_comet"
7676

77-
- name: "Spark 3.5.4, JDK 11, Scala 2.12"
78-
java_version: "11"
79-
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.4 -Pscala-2.12"
80-
scan_impl: "native_comet"
81-
8277
- name: "Spark 3.5.5, JDK 17, Scala 2.13"
8378
java_version: "17"
8479
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.5 -Pscala-2.13"
8580
scan_impl: "native_comet"
8681

82+
- name: "Spark 3.5.6, JDK 17, Scala 2.13"
83+
java_version: "17"
84+
maven_opts: "-Pspark-3.5 -Dspark.version=3.5.6 -Pscala-2.13"
85+
scan_impl: "native_comet"
86+
8787
- name: "Spark 3.5, JDK 17, Scala 2.12 native_datafusion"
8888
java_version: "17"
8989
maven_opts: "-Pspark-3.5 -Pscala-2.12"
@@ -175,4 +175,4 @@ jobs:
175175
suites: ${{ matrix.suite.name == 'sql' && matrix.profile.name == 'Spark 3.4, JDK 11, Scala 2.12' && '' || matrix.suite.value }}
176176
maven_opts: ${{ matrix.profile.maven_opts }}
177177
scan_impl: ${{ matrix.profile.scan_impl }}
178-
upload-test-reports: true
178+
upload-test-reports: true

.github/workflows/spark_sql_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
matrix:
5252
os: [ubuntu-24.04]
5353
java-version: [11]
54-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.6'}]
54+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
5555
module:
5656
- {name: "catalyst", args1: "catalyst/test", args2: ""}
5757
- {name: "sql_core-1", args1: "", args2: sql/testOnly * -- -l org.apache.spark.tags.ExtendedSQLTest -l org.apache.spark.tags.SlowSQLTest}
@@ -100,7 +100,7 @@ jobs:
100100
matrix:
101101
os: [ ubuntu-24.04 ]
102102
java-version: [ 11 ]
103-
spark-version: [ { short: '3.4', full: '3.4.3' }, { short: '3.5', full: '3.5.6' } ]
103+
spark-version: [ { short: '3.4', full: '3.4.3' }, { short: '3.5', full: '3.5.7' } ]
104104
module:
105105
- { name: "catalyst", args1: "catalyst/test", args2: "" }
106106
- { name: "sql_core-1", args1: "", args2: sql/testOnly * -- -l org.apache.spark.tags.ExtendedSQLTest -l org.apache.spark.tags.SlowSQLTest }
@@ -149,7 +149,7 @@ jobs:
149149
matrix:
150150
os: [ubuntu-24.04]
151151
java-version: [11]
152-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.6'}]
152+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
153153
module:
154154
- {name: "catalyst", args1: "catalyst/test", args2: ""}
155155
- {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_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.6'}]
38+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
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.6'}]
38+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.7'}]
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ Other versions may work well enough for development and evaluation purposes.
3838
| Spark Version | Java Version | Scala Version | Comet Tests in CI | Spark SQL Tests in CI |
3939
|---------------| ------------ | ------------- |-------------------|-----------------------|
4040
| 3.4.3 | 11/17 | 2.12/2.13 | Yes | Yes |
41-
| 3.5.4 | 11/17 | 2.12/2.13 | Yes | No |
4241
| 3.5.5 | 11/17 | 2.12/2.13 | Yes | No |
43-
| 3.5.6 | 11/17 | 2.12/2.13 | Yes | Yes |
42+
| 3.5.6 | 11/17 | 2.12/2.13 | Yes | No |
43+
| 3.5.7 | 11/17 | 2.12/2.13 | Yes | Yes |
4444

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

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.6 AS builder
18+
FROM apache/spark:3.5.7 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.6
73+
FROM apache/spark:3.5.7
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.6</spark.version>
73+
<spark.version>3.5.7</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>
@@ -609,7 +609,7 @@ under the License.
609609
<id>spark-3.5</id>
610610
<properties>
611611
<scala.version>2.12.18</scala.version>
612-
<spark.version>3.5.6</spark.version>
612+
<spark.version>3.5.7</spark.version>
613613
<spark.version.short>3.5</spark.version.short>
614614
<parquet.version>1.13.1</parquet.version>
615615
<slf4j.version>2.0.7</slf4j.version>

0 commit comments

Comments
 (0)