Skip to content

Commit 25f46b5

Browse files
authored
infra: upgrade spark to 4.0.1 (#2566)
<!-- Thanks for opening a pull request! --> <!-- In the case this PR will resolve an issue, please replace ${GITHUB_ISSUE_ID} below with the actual Github issue id. --> <!-- Closes #${GITHUB_ISSUE_ID} --> # Rationale for this change This PR changes the integration test to use Spark 4.0.1 with scala 2.13 and hadoop 3.4.1 Hadoop 3.4.x started to use `software.amazon.awssdk.bundle` instead of `com.amazonaws.aws-java-sdk-bundle` https://hadoop.apache.org/docs/r3.4.1/hadoop-aws/dependency-analysis.html ## Are these changes tested? ## Are there any user-facing changes? <!-- In the case of user-facing changes, please add the changelog label. -->
1 parent 34265fb commit 25f46b5

File tree

4 files changed

+78
-74
lines changed

4 files changed

+78
-74
lines changed

dev/spark/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
ARG BASE_IMAGE_SPARK_VERSION=3.5.6
16+
ARG BASE_IMAGE_SPARK_VERSION=4.0.1
1717

1818
FROM apache/spark:${BASE_IMAGE_SPARK_VERSION}
1919

2020
# Dependency versions - keep these compatible
2121
ARG ICEBERG_VERSION=1.10.0
22-
ARG ICEBERG_SPARK_RUNTIME_VERSION=3.5_2.12
23-
ARG SPARK_VERSION=3.5.6
24-
ARG SCALA_VERSION=2.12
25-
ARG HADOOP_VERSION=3.3.4
26-
ARG AWS_SDK_VERSION=1.12.753
22+
ARG ICEBERG_SPARK_RUNTIME_VERSION=4.0_2.13
23+
ARG SPARK_VERSION=4.0.1
24+
ARG HADOOP_VERSION=3.4.1
25+
ARG SCALA_VERSION=2.13
26+
ARG AWS_SDK_VERSION=2.24.6
2727
ARG MAVEN_MIRROR=https://repo.maven.apache.org/maven2
2828

2929
USER root
@@ -47,7 +47,7 @@ ENV JARS_TO_DOWNLOAD="\
4747
org/apache/iceberg/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}/${ICEBERG_VERSION}/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar \
4848
org/apache/iceberg/iceberg-aws-bundle/${ICEBERG_VERSION}/iceberg-aws-bundle-${ICEBERG_VERSION}.jar \
4949
org/apache/hadoop/hadoop-aws/${HADOOP_VERSION}/hadoop-aws-${HADOOP_VERSION}.jar \
50-
com/amazonaws/aws-java-sdk-bundle/${AWS_SDK_VERSION}/aws-java-sdk-bundle-${AWS_SDK_VERSION}.jar"
50+
software/amazon/awssdk/bundle/${AWS_SDK_VERSION}/bundle-${AWS_SDK_VERSION}.jar"
5151

5252
# Download JARs with retry logic
5353
RUN set -e && \

dev/spark/spark-defaults.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,5 @@ spark.sql.defaultCatalog rest
4848
spark.ui.enabled true
4949
spark.eventLog.enabled true
5050
spark.eventLog.dir /home/iceberg/spark-events
51+
52+
spark.sql.ansi.enabled false

0 commit comments

Comments
 (0)