Skip to content

Commit 24f3e4f

Browse files
andygroveandygrove
committed
Merge remote-tracking branch 'apache/main' into df52
2 parents 2dd8909 + f172b7c commit 24f3e4f

24 files changed

Lines changed: 1067 additions & 575 deletions

File tree

‎.github/workflows/iceberg_spark_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ jobs:
6969
~/.cargo/registry
7070
~/.cargo/git
7171
native/target
72-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
72+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
7373
restore-keys: |
74-
${{ runner.os }}-cargo-ci-
74+
${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-
7575
7676
- name: Build native library
7777
# Use CI profile for faster builds (no LTO) and to share cache with pr_build_linux.yml.
@@ -88,7 +88,7 @@ jobs:
8888
~/.cargo/registry
8989
~/.cargo/git
9090
native/target
91-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
91+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
9292

9393
- name: Upload native library
9494
uses: actions/upload-artifact@v6

‎.github/workflows/pr_build_linux.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ jobs:
8484
~/.cargo/registry
8585
~/.cargo/git
8686
native/target
87-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
87+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
8888
restore-keys: |
89-
${{ runner.os }}-cargo-ci-
89+
${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-
9090
9191
- name: Build native library (CI profile)
9292
run: |
@@ -112,7 +112,7 @@ jobs:
112112
~/.cargo/registry
113113
~/.cargo/git
114114
native/target
115-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
115+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
116116

117117
# Run Rust tests (runs in parallel with build-native, uses debug builds)
118118
linux-test-rust:
@@ -138,9 +138,9 @@ jobs:
138138
~/.cargo/git
139139
native/target
140140
# Note: Java version intentionally excluded - Rust target is JDK-independent
141-
key: ${{ runner.os }}-cargo-debug-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
141+
key: ${{ runner.os }}-cargo-debug-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
142142
restore-keys: |
143-
${{ runner.os }}-cargo-debug-
143+
${{ runner.os }}-cargo-debug-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-
144144
145145
- name: Rust test steps
146146
uses: ./.github/actions/rust-test
@@ -153,7 +153,7 @@ jobs:
153153
~/.cargo/registry
154154
~/.cargo/git
155155
native/target
156-
key: ${{ runner.os }}-cargo-debug-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
156+
key: ${{ runner.os }}-cargo-debug-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
157157

158158
linux-test:
159159
needs: build-native

‎.github/workflows/pr_build_macos.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ jobs:
8484
~/.cargo/registry
8585
~/.cargo/git
8686
native/target
87-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
87+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
8888
restore-keys: |
89-
${{ runner.os }}-cargo-ci-
89+
${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-
9090
9191
- name: Build native library (CI profile)
9292
run: |
@@ -112,7 +112,7 @@ jobs:
112112
~/.cargo/registry
113113
~/.cargo/git
114114
native/target
115-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
115+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
116116

117117
macos-aarch64-test:
118118
needs: build-native

‎.github/workflows/spark_sql_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
~/.cargo/registry
7676
~/.cargo/git
7777
native/target
78-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
78+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
7979
restore-keys: |
80-
${{ runner.os }}-cargo-ci-
80+
${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-
8181
8282
- name: Build native library (CI profile)
8383
run: |
@@ -101,7 +101,7 @@ jobs:
101101
~/.cargo/registry
102102
~/.cargo/git
103103
native/target
104-
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}
104+
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
105105

106106
spark-sql-test:
107107
needs: build-native

‎common/src/main/java/org/apache/comet/parquet/ArrowConstantColumnReader.java‎

Lines changed: 0 additions & 255 deletions
This file was deleted.

0 commit comments

Comments
 (0)