Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
94 changes: 94 additions & 0 deletions .github/workflows/iceberg.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

name: Iceberg

on:
workflow_dispatch:
push:
branches:
- master
- branch-*
pull_request:
branches:
- master
- branch-*

concurrency:
group: iceberg-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
test-iceberg:
name: Test Iceberg (${{ matrix.sparkver }} / JDK${{ matrix.javaver }} / Scala${{ matrix.scalaver }})
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
include:
- sparkver: "3.4"
scalaver: "2.12"
javaver: "17"
- sparkver: "3.5"
scalaver: "2.12"
javaver: "17"
- sparkver: "3.5"
scalaver: "2.12"
javaver: "21"
- sparkver: "4.0"
scalaver: "2.13"
javaver: "21"

steps:
- name: Checkout Auron
uses: actions/checkout@v6

- name: Setup Java and Maven cache
uses: actions/setup-java@v5
with:
distribution: 'adopt-hotspot'
java-version: ${{ matrix.javaver }}
cache: 'maven'

- name: Build dependencies (skip tests)
run: >
./build/mvn -B install
-pl thirdparty/auron-iceberg
-am
-Pscala-${{ matrix.scalaver }}
-Pspark-${{ matrix.sparkver }}
-Piceberg
-DicebergEnabled=true
-DicebergVersion=1.10.1
-DskipTests

- name: Test Iceberg Module
run: >
./build/mvn -B test
-pl thirdparty/auron-iceberg
-Pscala-${{ matrix.scalaver }}
-Pspark-${{ matrix.sparkver }}
-Piceberg
-DicebergEnabled=true
-DicebergVersion=1.10.1

- name: Upload reports
if: failure()
uses: actions/upload-artifact@v6
with:
name: auron-iceberg-${{ matrix.sparkver }}-jdk${{ matrix.javaver }}-test-report
path: thirdparty/auron-iceberg/target/surefire-reports
10 changes: 5 additions & 5 deletions auron-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ SUPPORTED_CELEBORN_VERSIONS=("0.5" "0.6")
SUPPORTED_UNIFFLE_VERSIONS=("0.10")
SUPPORTED_PAIMON_VERSIONS=("1.2")
SUPPORTED_FLINK_VERSIONS=("1.18")
SUPPORTED_ICEBERG_VERSIONS=("1.9")
SUPPORTED_ICEBERG_VERSIONS=("1.10.1")

# -----------------------------------------------------------------------------
# Function: print_help
Expand Down Expand Up @@ -270,11 +270,11 @@ while [[ $# -gt 0 ]]; do
print_invalid_option_error Iceberg "$ICEBERG_VER" "${SUPPORTED_ICEBERG_VERSIONS[@]}"
fi
if [ -z "$SPARK_VER" ]; then
echo "ERROR: Building iceberg requires spark at the same time, and only Spark versions 3.4 or 3.5 are supported."
echo "ERROR: Building iceberg requires spark at the same time, and only Spark versions 3.4 to 4.0 are supported."
exit 1
fi
if [ "$SPARK_VER" != "3.4" ] && [ "$SPARK_VER" != "3.5" ]; then
echo "ERROR: Building iceberg requires spark versions are 3.4 or 3.5."
if [ "$SPARK_VER" != "3.4" ] && [ "$SPARK_VER" != "3.5" ] && [ "$SPARK_VER" != "4.0" ]; then
echo "ERROR: Building iceberg requires spark versions are 3.4, 3.5 or 4.0."
exit 1
fi
shift 2
Expand Down Expand Up @@ -393,7 +393,7 @@ if [[ -n "$FLINK_VER" ]]; then
BUILD_ARGS+=("-Pflink-$FLINK_VER")
fi
if [[ -n "$ICEBERG_VER" ]]; then
BUILD_ARGS+=("-Piceberg-$ICEBERG_VER")
BUILD_ARGS+=("-Piceberg" "-DicebergEnabled=true" "-DicebergVersion=$ICEBERG_VER")
fi

MVN_ARGS=("${CLEAN_ARGS[@]}" "${BUILD_ARGS[@]}")
Expand Down
6 changes: 3 additions & 3 deletions dev/reformat
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ else
cargo fmt --all -q --
fi

# Check or format all code, including third-party code, with spark-3.5
# Check or format all code, including third-party code, with spark-3.4
Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

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

The comment says "spark-3.4" but the code uses "spark-3.5". Update the comment to accurately reflect the Spark version being used.

Suggested change
# Check or format all code, including third-party code, with spark-3.4
# Check or format all code, including third-party code, with spark-3.5

Copilot uses AI. Check for mistakes.
sparkver=spark-3.5
Comment on lines +51 to 52
Copy link
Contributor

Choose a reason for hiding this comment

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

Should the comment be spark-3.5?

for celebornver in celeborn-0.5 celeborn-0.6
do
run_maven -P"${sparkver}" -Pceleborn,"${celebornver}" -Puniffle,uniffle-0.10 -Ppaimon,paimon-1.2 -Pflink,flink-1.18 -Piceberg,iceberg-1.9
run_maven -P"${sparkver}" -P"${celebornver}" -Puniffle-0.10 -Ppaimon-1.2 -Pflink-1.18 -Piceberg -DicebergEnabled=true -DicebergVersion=1.10.1

done

sparkvers=(spark-3.0 spark-3.1 spark-3.2 spark-3.3 spark-3.4)
sparkvers=(spark-3.0 spark-3.1 spark-3.2 spark-3.3 spark-3.5)
Copy link
Contributor

Choose a reason for hiding this comment

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

This change seems unnecessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for taking the time to look into this issue. From my perspective, this change indeed shouldn’t have appeared in #2016. I’ve submitted #2018 to address it—when you have a moment, could you please take a look? Thanks very much!

Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

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

The sparkvers array should include "spark-3.4" to match the array iteration below. The comment on line 51 and the code on line 52 both reference spark-3.5, but the array only includes spark-3.5 once. It appears spark-3.4 was removed from the array when it should have been spark-3.5 that was removed since it's already handled in the celeborn loop above. This would cause the code to not be formatted for spark-3.4.

Suggested change
sparkvers=(spark-3.0 spark-3.1 spark-3.2 spark-3.3 spark-3.5)
sparkvers=(spark-3.0 spark-3.1 spark-3.2 spark-3.3 spark-3.4)

Copilot uses AI. Check for mistakes.
for sparkver in "${sparkvers[@]}"
do
run_maven -P"${sparkver}"
Expand Down
Loading
Loading