Skip to content

fix: [iceberg] Switch to OSS Spark and run Iceberg Spark tests in parallel #1987

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+558 −72
Open

fix: [iceberg] Switch to OSS Spark and run Iceberg Spark tests in parallel #1987

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f02b930
fix: [iceberg] Enable CometShuffleManager in Iceberg Spark tests
hsiang-c Jul 3, 2025
905660c
Depends on OSS Spark
hsiang-c Jul 3, 2025
3b35719
Parallelize Iceberg Spark tests
hsiang-c Jul 3, 2025
b574107
fix: no need to change directory
hsiang-c Jul 3, 2025
a0ba164
Change build order
hsiang-c Jul 4, 2025
4bc99f4
Checkout action doesn't persist across jobs
hsiang-c Jul 7, 2025
bf9ee90
Need to checkout first
hsiang-c Jul 7, 2025
43c830b
Move Comet build to prepare stage
hsiang-c Jul 7, 2025
7758599
Replicate setup 3 times
hsiang-c Jul 7, 2025
739cfc3
Apply spotless
hsiang-c Jul 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
48 changes: 0 additions & 48 deletions .github/actions/setup-spark-local-jar/action.yaml
View file
Open in desktop

This file was deleted.

88 changes: 74 additions & 14 deletions .github/workflows/iceberg_spark_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ env:
RUST_VERSION: stable

jobs:
iceberg-spark-sql:
prepare:
if: contains(github.event.pull_request.title, '[iceberg]')
strategy:
matrix:
os: [ubuntu-24.04]
java-version: [11, 17]
iceberg-version: [{short: '1.8', full: '1.8.1'}]
spark-version: [{short: '3.5', full: '3.5.6'}]
scala-version: ['2.13']
os: [ ubuntu-24.04 ]
java-version: [ 11, 17 ]
iceberg-version: [ { short: '1.8', full: '1.8.1' } ]
spark-version: [ { short: '3.5', full: '3.5.6' } ]
scala-version: [ '2.13' ]
fail-fast: false
name: iceberg-spark-sql/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
name: Build native and patched Iceberg
runs-on: ${{ matrix.os }}
container:
image: amd64/rust
Expand All @@ -69,18 +69,78 @@ jobs:
iceberg-version: ${{ matrix.iceberg-version.full }}
scala-version: ${{ matrix.scala-version }}
spark-short-version: ${{ matrix.spark-version.short }}
- name: Build local Spark jar with comet patch
uses: ./.github/actions/setup-spark-local-jar
with:
spark-short-version: ${{ matrix.spark-version.short }}
spark-version: ${{ matrix.spark-version.full }}
scala-version: ${{ matrix.scala-version }}

iceberg-spark:
needs: [prepare]
strategy:
matrix:
os: [ubuntu-24.04]
java-version: [11, 17]
iceberg-version: [{short: '1.8', full: '1.8.1'}]
spark-version: [{short: '3.5', full: '3.5.6'}]
scala-version: ['2.13']
fail-fast: false
name: iceberg-spark/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
runs-on: ${{ matrix.os }}
container:
image: amd64/rust
env:
SPARK_LOCAL_IP: localhost
steps:
- name: Run Iceberg Spark tests
run: |
cd apache-iceberg
rm -rf /root/.m2/repository/org/apache/parquet # somehow parquet cache requires cleanups
ENABLE_COMET=true ./gradlew -DsparkVersions=${{ matrix.spark-version.short }} -DscalaVersion=${{ matrix.scala-version }} -DflinkVersions= -DkafkaVersions= \
:iceberg-spark:iceberg-spark-${{ matrix.spark-version.short }}_${{ matrix.scala-version }}:check \
-Pquick=true -x javadoc

iceberg-spark-extensions:
needs: [prepare]
strategy:
matrix:
os: [ubuntu-24.04]
java-version: [11, 17]
iceberg-version: [{short: '1.8', full: '1.8.1'}]
spark-version: [{short: '3.5', full: '3.5.6'}]
scala-version: ['2.13']
fail-fast: false
name: iceberg-spark-extensions/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
runs-on: ${{ matrix.os }}
container:
image: amd64/rust
env:
SPARK_LOCAL_IP: localhost
steps:
- name: Run Iceberg Spark tests
run: |
cd apache-iceberg
rm -rf /root/.m2/repository/org/apache/parquet # somehow parquet cache requires cleanups
ENABLE_COMET=true ./gradlew -DsparkVersions=${{ matrix.spark-version.short }} -DscalaVersion=${{ matrix.scala-version }} -DflinkVersions= -DkafkaVersions= \
:iceberg-spark:iceberg-spark-extensions-${{ matrix.spark-version.short }}_${{ matrix.scala-version }}:check \
:iceberg-spark:iceberg-spark-runtime-${{ matrix.spark-version.short }}_${{ matrix.scala-version }}:check \
-Pquick=true -x javadoc

iceberg-spark-runtime:
needs: [prepare]
strategy:
matrix:
os: [ubuntu-24.04]
java-version: [11, 17]
iceberg-version: [{short: '1.8', full: '1.8.1'}]
spark-version: [{short: '3.5', full: '3.5.6'}]
scala-version: ['2.13']
fail-fast: false
name: iceberg-spark-runtime/${{ matrix.os }}/iceberg-${{ matrix.iceberg-version.full }}/spark-${{ matrix.spark-version.full }}/scala-${{ matrix.scala-version }}/java-${{ matrix.java-version }}
runs-on: ${{ matrix.os }}
container:
image: amd64/rust
env:
SPARK_LOCAL_IP: localhost
steps:
- name: Run Iceberg Spark tests
run: |
cd apache-iceberg
rm -rf /root/.m2/repository/org/apache/parquet # somehow parquet cache requires cleanups
ENABLE_COMET=true ./gradlew -DsparkVersions=${{ matrix.spark-version.short }} -DscalaVersion=${{ matrix.scala-version }} -DflinkVersions= -DkafkaVersions= \
:iceberg-spark:iceberg-spark-runtime-${{ matrix.spark-version.short }}_${{ matrix.scala-version }}:check \
-Pquick=true -x javadoc
Loading
Loading