Skip to content

Commit 3f2142b

Browse files
committed
use iceberg java 1.10.0rc2
1 parent 19ba343 commit 3f2142b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

dev/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ WORKDIR ${SPARK_HOME}
3939
# Remember to also update `tests/conftest`'s spark setting
4040
ENV SPARK_VERSION=3.5.6
4141
ENV ICEBERG_SPARK_RUNTIME_VERSION=3.5_2.12
42-
ENV ICEBERG_VERSION=1.9.1
42+
ENV ICEBERG_VERSION=1.10.0
4343
ENV PYICEBERG_VERSION=0.9.1
4444

45+
ENV BASE_ARTIFACT_URL=https://repository.apache.org/content/repositories/orgapacheiceberg-1243
4546
RUN curl --retry 5 -s -C - https://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/spark-${SPARK_VERSION}-bin-hadoop3.tgz -o spark-${SPARK_VERSION}-bin-hadoop3.tgz \
4647
&& tar xzf spark-${SPARK_VERSION}-bin-hadoop3.tgz --directory /opt/spark --strip-components 1 \
4748
&& rm -rf spark-${SPARK_VERSION}-bin-hadoop3.tgz
4849

4950
# Download iceberg spark runtime
50-
RUN curl --retry 5 -s https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}/${ICEBERG_VERSION}/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar \
51+
RUN curl --retry 5 -s ${BASE_ARTIFACT_URL}/org/apache/iceberg/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}/${ICEBERG_VERSION}/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar \
5152
-Lo /opt/spark/jars/iceberg-spark-runtime-${ICEBERG_SPARK_RUNTIME_VERSION}-${ICEBERG_VERSION}.jar
5253

53-
5454
# Download AWS bundle
55-
RUN curl --retry 5 -s https://repo1.maven.org/maven2/org/apache/iceberg/iceberg-aws-bundle/${ICEBERG_VERSION}/iceberg-aws-bundle-${ICEBERG_VERSION}.jar \
55+
RUN curl --retry 5 -s ${BASE_ARTIFACT_URL}/org/apache/iceberg/iceberg-aws-bundle/${ICEBERG_VERSION}/iceberg-aws-bundle-${ICEBERG_VERSION}.jar \
5656
-Lo /opt/spark/jars/iceberg-aws-bundle-${ICEBERG_VERSION}.jar
5757

5858
COPY spark-defaults.conf /opt/spark/conf

tests/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2534,7 +2534,7 @@ def spark() -> "SparkSession":
25342534
# Remember to also update `dev/Dockerfile`
25352535
spark_version = ".".join(importlib.metadata.version("pyspark").split(".")[:2])
25362536
scala_version = "2.12"
2537-
iceberg_version = "1.9.2"
2537+
iceberg_version = "1.10.0"
25382538
hadoop_version = "3.3.4"
25392539
aws_sdk_version = "1.12.753"
25402540

@@ -2551,6 +2551,7 @@ def spark() -> "SparkSession":
25512551

25522552
spark = (
25532553
SparkSession.builder.appName("PyIceberg integration test")
2554+
.config("spark.jars.repositories", "https://repository.apache.org/content/repositories/orgapacheiceberg-1243/")
25542555
.config("spark.sql.session.timeZone", "UTC")
25552556
.config("spark.sql.shuffle.partitions", "1")
25562557
.config("spark.default.parallelism", "1")

0 commit comments

Comments
 (0)