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
13 changes: 12 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jobs:
iceberg_1_9: ${{ steps.compute.outputs.iceberg_1_9 }}
iceberg_1_10: ${{ steps.compute.outputs.iceberg_1_10 }}
iceberg_1_11: ${{ steps.compute.outputs.iceberg_1_11 }}
delta: ${{ steps.compute.outputs.delta }}
steps:
- uses: actions/checkout@v7
with:
Expand All @@ -137,7 +138,7 @@ jobs:
run: |
set -euo pipefail
if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then
for key in build_linux build_macos benchmark docs spark_3_4 spark_3_5 spark_4_0 spark_4_1 iceberg_1_8 iceberg_1_9 iceberg_1_10 iceberg_1_11; do
for key in build_linux build_macos benchmark docs spark_3_4 spark_3_5 spark_4_0 spark_4_1 iceberg_1_8 iceberg_1_9 iceberg_1_10 iceberg_1_11 delta; do
echo "${key}=true" >> "$GITHUB_OUTPUT"
done
exit 0
Expand Down Expand Up @@ -231,6 +232,16 @@ jobs:
spark-full: '3.5.9'
java: 17

delta_contrib:
name: Delta Contrib Tests
needs: changes
if: |
needs.changes.outputs.delta == 'true' &&
(github.event_name == 'push' ||
github.event_name == 'workflow_dispatch' ||
github.event_name == 'pull_request')
uses: ./.github/workflows/delta_contrib_test.yml

spark_4_0:
name: Spark SQL Tests (Spark 4.0)
needs: changes
Expand Down
127 changes: 127 additions & 0 deletions .github/workflows/delta_contrib_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# 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: Delta Contrib Tests

# Reusable: invoked by ci.yml. Triggering, path filters, and concurrency
# live in the umbrella workflow.
on:
workflow_call:

permissions:
contents: read

env:
RUST_VERSION: stable
RUST_BACKTRACE: 1
# Force GNU ld on Linux: rust-lld cannot resolve -ljvm against the Zulu JDK
# layout installed by setup-java (same rationale as pr_build_linux.yml).
RUSTFLAGS: "-Clink-arg=-fuse-ld=bfd"

jobs:

contrib-delta:
name: Delta contrib (Spark ${{ matrix.profile.spark }})
runs-on: ubuntu-24.04
container:
image: amd64/rust
strategy:
matrix:
profile:
- spark: "3.5"
java_version: "17"
- spark: "4.0"
java_version: "17"
- spark: "4.1"
java_version: "17"
# spark-4.2 is intentionally absent: the contrib profile is dormant
# until a Delta release supports Spark 4.2.
fail-fast: false
steps:
- uses: actions/checkout@v7

- name: Setup Rust & Java toolchain
uses: ./.github/actions/setup-builder
with:
rust-version: ${{ env.RUST_VERSION }}
jdk-version: ${{ matrix.profile.java_version }}

- name: Cache Maven dependencies
uses: actions/cache@v6
with:
path: |
~/.m2/repository
/root/.m2/repository
key: ${{ runner.os }}-java-maven-${{ hashFiles('**/pom.xml') }}-delta-${{ matrix.profile.spark }}
restore-keys: |
${{ runner.os }}-java-maven-

- name: Build native library with the delta feature
run: |
cd native
cargo build --features delta

- name: Install Comet core jars
run: |
./mvnw -B -q -Pspark-${{ matrix.profile.spark }} install -pl common,spark -DskipTests -Dspotless.check.skip=true

- name: Run Delta contrib test suites
run: |
SPARK_HOME=$(pwd) COMET_CONF_DIR=$(pwd)/conf ./mvnw -B -Pspark-${{ matrix.profile.spark }},delta test -pl contrib/delta

# `delta` is in the default feature set, so no regular job builds without it;
# this keeps the feature-off build and its "built without the delta feature"
# error arm (planner.rs cfg(not(feature = "delta"))) from becoming dead code.
feature-off-build:
Comment on lines +38 to +89
name: Feature-off native build
runs-on: ubuntu-24.04
container:
image: amd64/rust
steps:
- uses: actions/checkout@v7

- name: Setup Rust & Java toolchain
uses: ./.github/actions/setup-builder
with:
rust-version: ${{ env.RUST_VERSION }}
jdk-version: "17"

- name: Test the delta-off error path
run: |
cd native
cargo test -p datafusion-comet --no-default-features --features hdfs-opendal delta_scan

# The contrib's dev tooling (benchmark and regression-harness scripts) is
# Python; keep it import-clean across currently supported interpreters.
dev-scripts-python:
Comment on lines +90 to +110
name: Delta dev scripts (Python ${{ matrix.python-version }})
runs-on: ubuntu-24.04
strategy:
matrix:
python-version: ["3.11", "3.12", "3.13", "3.14"]
fail-fast: false
steps:
- uses: actions/checkout@v7

- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

- name: Byte-compile contrib dev scripts
run: |
python -m compileall -q contrib/delta/dev
Comment on lines +111 to +127
Loading