Skip to content

[CORE] Bump iceberg version of spark 3.3 to 1.5.0 #8418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhztheplayer merged 7 commits into from
Jan 23, 2025
Merged

[CORE] Bump iceberg version of spark 3.3 to 1.5.0 #8418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf7f716
Bump iceberg version of spark 3.3 to 1.5.0
j7nhai Jan 3, 2025
766d249
add scala-collection-compat
j7nhai Jan 3, 2025
30ea39f
Merge branch 'main' into j7nhai-iceberg-dev
j7nhai Jan 6, 2025
5972f4b
Merge branch 'main' into j7nhai-iceberg-dev
j7nhai Jan 6, 2025
2f1b104
Merge branch 'main' into j7nhai-iceberg-dev
j7nhai Jan 7, 2025
4691d12
fix click house ci.
j7nhai Jan 7, 2025
2080bc2
Merge branch 'j7nhai-iceberg-dev' of https://github.com/j7nhai/gluten…
j7nhai Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions backends-clickhouse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,13 @@
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-${sparkbundle.version}_${scala.binary.version}</artifactId>
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>test</scope>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
</dependency>
</dependencies>
</profile>
Expand Down
12 changes: 5 additions & 7 deletions backends-velox/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>test</scope>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
Expand Down Expand Up @@ -214,6 +208,10 @@
<version>${scala.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.binary.version}</artifactId>
Expand Down
12 changes: 5 additions & 7 deletions gluten-iceberg/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-${sparkbundle.version}_${scala.binary.version}</artifactId>
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>provided</scope>
</dependency>
Expand All @@ -46,6 +46,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.binary.version}</artifactId>
Expand All @@ -67,12 +71,6 @@
<version>${spark.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-spark-runtime-${sparkbundle.version}_${scala.binary.version}</artifactId>
<version>${iceberg.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
Expand Down
9 changes: 7 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,7 @@
<sparkbundle.version>3.3</sparkbundle.version>
<sparkshim.artifactId>spark-sql-columnar-shims-spark33</sparkshim.artifactId>
<spark.version>3.3.1</spark.version>
<!-- keep using iceberg v1.3.1 for parquet compatibilty. -->
<iceberg.version>1.3.1</iceberg.version>
<iceberg.version>1.5.0</iceberg.version>
Copy link
Copy Markdown
Member

@zhouyuan zhouyuan Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this parquet compatibility is still valid for spark33
CC @ulysses-you

Copy link
Copy Markdown
Contributor Author

@j7nhai j7nhai Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @liujiayi771

Copy link
Copy Markdown
Contributor

@liujiayi771 liujiayi771 Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what the compatibility issue is here. @yma11

Copy link
Copy Markdown
Contributor

@yma11 yma11 Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I remember, there should be an API mismatch because of different parquet version used by icerberg 1.5.0+ and Spark3.3.1. But I am not sure why it's okay now as no UT failure detected. Suggest you guys double check this part.

<delta.package.name>delta-core</delta.package.name>
<delta.version>2.3.0</delta.version>
<delta.binary.version>23</delta.binary.version>
Expand Down Expand Up @@ -1200,6 +1199,12 @@
<version>${fasterxml.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-collection-compat_${scala.binary.version}</artifactId>
<version>2.11.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down