Skip to content

Commit b515b34

Browse files
author
Yaniv Kunda
authored
upgraded spark 3.5.5 to 3.5.6 (#1861)
1 parent 381a342 commit b515b34

File tree

10 files changed

+3010
-18
lines changed

10 files changed

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

.github/workflows/spark_sql_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
matrix:
4646
os: [ubuntu-24.04]
4747
java-version: [11]
48-
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.4'}, {short: '3.5', full: '3.5.5'}]
48+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.4'}, {short: '3.5', full: '3.5.5'}, {short: '3.5', full: '3.5.6'}]
4949
module:
5050
- {name: "catalyst", args1: "catalyst/test", args2: ""}
5151
- {name: "sql/core-1", args1: "", args2: sql/testOnly * -- -l org.apache.spark.tags.ExtendedSQLTest -l org.apache.spark.tags.SlowSQLTest}
@@ -84,7 +84,7 @@ jobs:
8484
matrix:
8585
os: [ubuntu-24.04]
8686
java-version: [11]
87-
spark-version: [{short: '3.5', full: '3.5.5'}]
87+
spark-version: [{short: '3.5', full: '3.5.6'}]
8888
module:
8989
- {name: "catalyst", args1: "catalyst/test", args2: ""}
9090
# - {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.5'}]
38+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.6'}]
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.5'}]
38+
spark-version: [{short: '3.4', full: '3.4.3'}, {short: '3.5', full: '3.5.6'}]
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}

dev/diffs/3.5.6.diff

Lines changed: 2991 additions & 0 deletions
Large diffs are not rendered by default.

docs/source/contributor-guide/spark-sql-tests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ of Apache Spark to enable Comet when running tests. This is a highly manual proc
9090
vary depending on the changes in the new version of Spark, but here is a general guide to the process.
9191

9292
We typically start by applying a patch from a previous version of Spark. For example, when enabling the tests
93-
for Spark version 3.5.5 we may start by applying the existing diff for 3.4.3 first.
93+
for Spark version 3.5.6 we may start by applying the existing diff for 3.5.5 first.
9494

9595
```shell
9696
cd git/apache/spark
97-
git checkout v3.5.5
98-
git apply --reject --whitespace=fix ../datafusion-comet/dev/diffs/3.4.3.diff
97+
git checkout v3.5.6
98+
git apply --reject --whitespace=fix ../datafusion-comet/dev/diffs/3.5.5.diff
9999
```
100100

101101
Any changes that cannot be cleanly applied will instead be written out to reject files. For example, the above
@@ -140,7 +140,7 @@ configuration setting to use 11 digits hashes for consistency with existing diff
140140

141141
```shell
142142
git config core.abbrev 11;
143-
git diff v3.5.5 > ../datafusion-comet/dev/diffs/3.5.5.diff
143+
git diff v3.5.6 > ../datafusion-comet/dev/diffs/3.5.6.diff
144144
```
145145

146146
## Running Tests in CI

docs/source/user-guide/installation.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ We recommend only using Comet with Spark versions where we currently have both C
3838
Other versions may work well enough for development and evaluation purposes.
3939

4040
| Spark Version | Java Version | Scala Version | Comet Tests in CI | Spark Tests in CI |
41-
| ------------- | ------------ | ------------- | ----------------- | ----------------- |
41+
|---------------| ------------ | ------------- | ----------------- | ----------------- |
4242
| 3.4.3 | 11/17 | 2.12/2.13 | Yes | Yes |
4343
| 3.5.2 | 11/17 | 2.12/2.13 | Partial\* | No |
4444
| 3.5.3 | 11/17 | 2.12/2.13 | Partial\* | No |
4545
| 3.5.4 | 11/17 | 2.12/2.13 | Partial\* | Yes |
46-
| 3.5.5 | 11/17 | 2.12/2.13 | Yes | Yes |
46+
| 3.5.5 | 11/17 | 2.12/2.13 | Partial\* | Yes |
47+
| 3.5.6 | 11/17 | 2.12/2.13 | Yes | Yes |
4748

4849
\* For older Spark 3.5.x releases, we do not test the full matrix of supported Java and Scala versions in CI.
4950

docs/source/user-guide/kubernetes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ spec:
8080
"spark.comet.exec.shuffle.enabled": "true"
8181
"spark.comet.exec.shuffle.mode": "auto"
8282
"spark.shuffle.manager": "org.apache.spark.sql.comet.execution.shuffle.CometShuffleManager"
83-
sparkVersion: 3.5.5
83+
sparkVersion: 3.5.6
8484
driver:
8585
labels:
86-
version: 3.5.5
86+
version: 3.5.6
8787
cores: 1
8888
coreLimit: 1200m
8989
memory: 512m
9090
serviceAccount: spark-operator-spark
9191
executor:
9292
labels:
93-
version: 3.5.5
93+
version: 3.5.6
9494
instances: 1
9595
cores: 1
9696
coreLimit: 1200m

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.5 AS builder
18+
FROM apache/spark:3.5.6 AS builder
1919

2020
USER root
2121

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

64-
FROM apache/spark:3.5.5
64+
FROM apache/spark:3.5.6
6565
ENV SPARK_VERSION=3.5
6666
ENV SCALA_VERSION=2.12
6767
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.8.0</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.5</spark.version>
73+
<spark.version>3.5.6</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>
@@ -601,7 +601,7 @@ under the License.
601601
<id>spark-3.5</id>
602602
<properties>
603603
<scala.version>2.12.18</scala.version>
604-
<spark.version>3.5.5</spark.version>
604+
<spark.version>3.5.6</spark.version>
605605
<spark.version.short>3.5</spark.version.short>
606606
<parquet.version>1.13.1</parquet.version>
607607
<slf4j.version>2.0.7</slf4j.version>

0 commit comments

Comments
 (0)