Skip to content

Commit c66024e

Browse files
andygroveandygrove
committed
upmerge
2 parents d9d424f + 34bbe78 commit c66024e

82 files changed

Lines changed: 4731 additions & 2974 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codeql.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
#
18+
19+
name: "CodeQL"
20+
21+
on:
22+
push:
23+
branches: [ "main" ]
24+
pull_request:
25+
branches: [ "main" ]
26+
schedule:
27+
- cron: '16 4 * * 1'
28+
29+
permissions:
30+
contents: read
31+
32+
jobs:
33+
analyze:
34+
name: Analyze Actions
35+
runs-on: ubuntu-latest
36+
permissions:
37+
contents: read
38+
security-events: write
39+
packages: read
40+
41+
steps:
42+
- name: Checkout repository
43+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
44+
with:
45+
persist-credentials: false
46+
47+
- name: Initialize CodeQL
48+
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4
49+
with:
50+
languages: actions
51+
52+
- name: Perform CodeQL Analysis
53+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4
54+
with:
55+
category: "/language:actions"

‎.github/workflows/docker-publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ jobs:
6262
- name: Echo Comet version
6363
run: echo "The current Comet version is ${{ env.COMET_VERSION }}"
6464
- name: Set up Docker Buildx
65-
uses: docker/setup-buildx-action@v3
65+
uses: docker/setup-buildx-action@v4
6666
- name: Login to GitHub Container Registry
67-
uses: docker/login-action@v3
67+
uses: docker/login-action@v4
6868
with:
6969
registry: ghcr.io
7070
username: ${{ github.actor }}
7171
password: ${{ secrets.GITHUB_TOKEN }}
7272
- name: Build and push
73-
uses: docker/build-push-action@v6
73+
uses: docker/build-push-action@v7
7474
with:
7575
platforms: linux/amd64,linux/arm64
7676
push: true

‎.github/workflows/iceberg_spark_test.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
9696

9797
- name: Upload native library
98-
uses: actions/upload-artifact@v6
98+
uses: actions/upload-artifact@v7
9999
with:
100100
name: native-lib-iceberg
101101
path: native/target/ci/libcomet.so
@@ -126,7 +126,7 @@ jobs:
126126
rust-version: ${{env.RUST_VERSION}}
127127
jdk-version: ${{ matrix.java-version }}
128128
- name: Download native library
129-
uses: actions/download-artifact@v7
129+
uses: actions/download-artifact@v8
130130
with:
131131
name: native-lib-iceberg
132132
path: native/target/release/
@@ -170,7 +170,7 @@ jobs:
170170
rust-version: ${{env.RUST_VERSION}}
171171
jdk-version: ${{ matrix.java-version }}
172172
- name: Download native library
173-
uses: actions/download-artifact@v7
173+
uses: actions/download-artifact@v8
174174
with:
175175
name: native-lib-iceberg
176176
path: native/target/release/
@@ -214,7 +214,7 @@ jobs:
214214
rust-version: ${{env.RUST_VERSION}}
215215
jdk-version: ${{ matrix.java-version }}
216216
- name: Download native library
217-
uses: actions/download-artifact@v7
217+
uses: actions/download-artifact@v8
218218
with:
219219
name: native-lib-iceberg
220220
path: native/target/release/
@@ -258,7 +258,7 @@ jobs:
258258
rust-version: ${{env.RUST_VERSION}}
259259
jdk-version: ${{ matrix.java-version }}
260260
- name: Download native library
261-
uses: actions/download-artifact@v7
261+
uses: actions/download-artifact@v8
262262
with:
263263
name: native-lib-iceberg
264264
path: native/target/release/
@@ -302,7 +302,7 @@ jobs:
302302
rust-version: ${{env.RUST_VERSION}}
303303
jdk-version: ${{ matrix.java-version }}
304304
- name: Download native library
305-
uses: actions/download-artifact@v7
305+
uses: actions/download-artifact@v8
306306
with:
307307
name: native-lib-iceberg
308308
path: native/target/release/
@@ -346,7 +346,7 @@ jobs:
346346
rust-version: ${{env.RUST_VERSION}}
347347
jdk-version: ${{ matrix.java-version }}
348348
- name: Download native library
349-
uses: actions/download-artifact@v7
349+
uses: actions/download-artifact@v8
350350
with:
351351
name: native-lib-iceberg
352352
path: native/target/release/

‎.github/workflows/pr_build_linux.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
build-native:
7070
needs: lint
7171
name: Build Native Library
72-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
72+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=8,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
7373
container:
7474
image: amd64/rust
7575
steps:
@@ -102,7 +102,7 @@ jobs:
102102
RUSTFLAGS: "-Ctarget-cpu=x86-64-v3"
103103

104104
- name: Upload native library
105-
uses: actions/upload-artifact@v6
105+
uses: actions/upload-artifact@v7
106106
with:
107107
name: native-lib-linux
108108
path: native/target/ci/libcomet.so
@@ -122,7 +122,7 @@ jobs:
122122
linux-test-rust:
123123
needs: lint
124124
name: ubuntu-latest/rust-test
125-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
125+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
126126
container:
127127
image: amd64/rust
128128
steps:
@@ -277,7 +277,7 @@ jobs:
277277
org.apache.spark.sql.CometToPrettyStringSuite
278278
fail-fast: false
279279
name: ${{ matrix.profile.name }}/${{ matrix.profile.scan_impl }} [${{ matrix.suite.name }}]
280-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
280+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
281281
container:
282282
image: amd64/rust
283283
env:
@@ -294,7 +294,7 @@ jobs:
294294
jdk-version: ${{ matrix.profile.java_version }}
295295

296296
- name: Download native library
297-
uses: actions/download-artifact@v7
297+
uses: actions/download-artifact@v8
298298
with:
299299
name: native-lib-linux
300300
# Download to release/ since Maven's -Prelease expects libcomet.so there
@@ -325,7 +325,7 @@ jobs:
325325
verify-benchmark-results-tpch:
326326
needs: build-native
327327
name: Verify TPC-H Results
328-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
328+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
329329
container:
330330
image: amd64/rust
331331
steps:
@@ -340,7 +340,7 @@ jobs:
340340
jdk-version: 11
341341

342342
- name: Download native library
343-
uses: actions/download-artifact@v7
343+
uses: actions/download-artifact@v8
344344
with:
345345
name: native-lib-linux
346346
path: native/target/release/
@@ -379,7 +379,7 @@ jobs:
379379
verify-benchmark-results-tpcds:
380380
needs: build-native
381381
name: Verify TPC-DS Results (${{ matrix.join }})
382-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
382+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=16,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion-comet', github.run_id) || 'ubuntu-latest' }}
383383
container:
384384
image: amd64/rust
385385
strategy:
@@ -398,7 +398,7 @@ jobs:
398398
jdk-version: 11
399399

400400
- name: Download native library
401-
uses: actions/download-artifact@v7
401+
uses: actions/download-artifact@v8
402402
with:
403403
name: native-lib-linux
404404
path: native/target/release/

‎.github/workflows/pr_build_macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
RUSTFLAGS: "-Ctarget-cpu=apple-m1"
103103

104104
- name: Upload native library
105-
uses: actions/upload-artifact@v6
105+
uses: actions/upload-artifact@v7
106106
with:
107107
name: native-lib-macos
108108
path: native/target/ci/libcomet.dylib
@@ -233,7 +233,7 @@ jobs:
233233
protoc-architecture: aarch_64
234234

235235
- name: Download native library
236-
uses: actions/download-artifact@v7
236+
uses: actions/download-artifact@v8
237237
with:
238238
name: native-lib-macos
239239
# Download to release/ since Maven's -Prelease expects libcomet.dylib there

‎.github/workflows/spark_sql_test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
RUSTFLAGS: "-Ctarget-cpu=x86-64-v3"
9292

9393
- name: Upload native library
94-
uses: actions/upload-artifact@v6
94+
uses: actions/upload-artifact@v7
9595
with:
9696
name: native-lib-linux
9797
path: native/target/ci/libcomet.so
@@ -145,7 +145,7 @@ jobs:
145145
rust-version: ${{env.RUST_VERSION}}
146146
jdk-version: ${{ matrix.config.java }}
147147
- name: Download native library
148-
uses: actions/download-artifact@v7
148+
uses: actions/download-artifact@v8
149149
with:
150150
name: native-lib-linux
151151
path: native/target/release/
@@ -168,7 +168,7 @@ jobs:
168168
LC_ALL: "C.UTF-8"
169169
- name: Upload fallback log
170170
if: ${{ github.event.inputs.collect-fallback-logs == 'true' }}
171-
uses: actions/upload-artifact@v6
171+
uses: actions/upload-artifact@v7
172172
with:
173173
name: fallback-log-spark-sql-${{ matrix.config.scan-impl }}-${{ matrix.module.name }}-spark-${{ matrix.config.spark-full }}
174174
path: "**/fallback.log"
@@ -180,14 +180,14 @@ jobs:
180180
runs-on: ubuntu-24.04
181181
steps:
182182
- name: Download fallback log artifacts
183-
uses: actions/download-artifact@v7
183+
uses: actions/download-artifact@v8
184184
with:
185185
path: fallback-logs/
186186
- name: Merge fallback logs
187187
run: |
188188
find ./fallback-logs/ -type f -name "fallback.log" -print0 | xargs -0 cat | sort -u > all_fallback.log
189189
- name: Upload merged fallback log
190-
uses: actions/upload-artifact@v6
190+
uses: actions/upload-artifact@v7
191191
with:
192192
name: all-fallback-log
193193
path: all_fallback.log

0 commit comments

Comments
 (0)