Skip to content

Commit 9bb2ea4

Browse files
authored
Merge branch 'main' into cast_float_to_timestamp
2 parents ac46828 + aaaa6a6 commit 9bb2ea4

89 files changed

Lines changed: 4112 additions & 4029 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@c793b717bc78562f491db7b0e93a3a178b099162 # v4
49+
with:
50+
languages: actions
51+
52+
- name: Perform CodeQL Analysis
53+
uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4
54+
with:
55+
category: "/language:actions"

.github/workflows/iceberg_spark_test.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
branches:
2727
- main
2828
paths-ignore:
29+
- "benchmarks/**"
2930
- "doc/**"
3031
- "docs/**"
3132
- "**.md"
@@ -34,6 +35,7 @@ on:
3435
- "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
3536
pull_request:
3637
paths-ignore:
38+
- "benchmarks/**"
3739
- "doc/**"
3840
- "docs/**"
3941
- "**.md"
@@ -93,7 +95,7 @@ jobs:
9395
key: ${{ runner.os }}-cargo-ci-${{ hashFiles('native/**/Cargo.lock', 'native/**/Cargo.toml') }}-${{ hashFiles('native/**/*.rs') }}
9496

9597
- name: Upload native library
96-
uses: actions/upload-artifact@v6
98+
uses: actions/upload-artifact@v7
9799
with:
98100
name: native-lib-iceberg
99101
path: native/target/ci/libcomet.so
@@ -124,7 +126,7 @@ jobs:
124126
rust-version: ${{env.RUST_VERSION}}
125127
jdk-version: ${{ matrix.java-version }}
126128
- name: Download native library
127-
uses: actions/download-artifact@v7
129+
uses: actions/download-artifact@v8
128130
with:
129131
name: native-lib-iceberg
130132
path: native/target/release/
@@ -168,7 +170,7 @@ jobs:
168170
rust-version: ${{env.RUST_VERSION}}
169171
jdk-version: ${{ matrix.java-version }}
170172
- name: Download native library
171-
uses: actions/download-artifact@v7
173+
uses: actions/download-artifact@v8
172174
with:
173175
name: native-lib-iceberg
174176
path: native/target/release/
@@ -212,7 +214,7 @@ jobs:
212214
rust-version: ${{env.RUST_VERSION}}
213215
jdk-version: ${{ matrix.java-version }}
214216
- name: Download native library
215-
uses: actions/download-artifact@v7
217+
uses: actions/download-artifact@v8
216218
with:
217219
name: native-lib-iceberg
218220
path: native/target/release/
@@ -256,7 +258,7 @@ jobs:
256258
rust-version: ${{env.RUST_VERSION}}
257259
jdk-version: ${{ matrix.java-version }}
258260
- name: Download native library
259-
uses: actions/download-artifact@v7
261+
uses: actions/download-artifact@v8
260262
with:
261263
name: native-lib-iceberg
262264
path: native/target/release/
@@ -300,7 +302,7 @@ jobs:
300302
rust-version: ${{env.RUST_VERSION}}
301303
jdk-version: ${{ matrix.java-version }}
302304
- name: Download native library
303-
uses: actions/download-artifact@v7
305+
uses: actions/download-artifact@v8
304306
with:
305307
name: native-lib-iceberg
306308
path: native/target/release/
@@ -344,7 +346,7 @@ jobs:
344346
rust-version: ${{env.RUST_VERSION}}
345347
jdk-version: ${{ matrix.java-version }}
346348
- name: Download native library
347-
uses: actions/download-artifact@v7
349+
uses: actions/download-artifact@v8
348350
with:
349351
name: native-lib-iceberg
350352
path: native/target/release/

.github/workflows/pr_build_linux.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
branches:
2727
- main
2828
paths-ignore:
29+
- "benchmarks/**"
2930
- "doc/**"
3031
- "docs/**"
3132
- "**.md"
@@ -34,6 +35,7 @@ on:
3435
- "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
3536
pull_request:
3637
paths-ignore:
38+
- "benchmarks/**"
3739
- "doc/**"
3840
- "docs/**"
3941
- "**.md"
@@ -67,7 +69,7 @@ jobs:
6769
build-native:
6870
needs: lint
6971
name: Build Native Library
70-
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', 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' }}
7173
container:
7274
image: amd64/rust
7375
steps:
@@ -100,7 +102,7 @@ jobs:
100102
RUSTFLAGS: "-Ctarget-cpu=x86-64-v3"
101103

102104
- name: Upload native library
103-
uses: actions/upload-artifact@v6
105+
uses: actions/upload-artifact@v7
104106
with:
105107
name: native-lib-linux
106108
path: native/target/ci/libcomet.so
@@ -120,7 +122,7 @@ jobs:
120122
linux-test-rust:
121123
needs: lint
122124
name: ubuntu-latest/rust-test
123-
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', 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' }}
124126
container:
125127
image: amd64/rust
126128
steps:
@@ -275,7 +277,7 @@ jobs:
275277
org.apache.spark.sql.CometToPrettyStringSuite
276278
fail-fast: false
277279
name: ${{ matrix.profile.name }}/${{ matrix.profile.scan_impl }} [${{ matrix.suite.name }}]
278-
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' }}
279281
container:
280282
image: amd64/rust
281283
env:
@@ -292,7 +294,7 @@ jobs:
292294
jdk-version: ${{ matrix.profile.java_version }}
293295

294296
- name: Download native library
295-
uses: actions/download-artifact@v7
297+
uses: actions/download-artifact@v8
296298
with:
297299
name: native-lib-linux
298300
# Download to release/ since Maven's -Prelease expects libcomet.so there
@@ -323,7 +325,7 @@ jobs:
323325
verify-benchmark-results-tpch:
324326
needs: build-native
325327
name: Verify TPC-H Results
326-
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', 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' }}
327329
container:
328330
image: amd64/rust
329331
steps:
@@ -338,7 +340,7 @@ jobs:
338340
jdk-version: 11
339341

340342
- name: Download native library
341-
uses: actions/download-artifact@v7
343+
uses: actions/download-artifact@v8
342344
with:
343345
name: native-lib-linux
344346
path: native/target/release/
@@ -377,7 +379,7 @@ jobs:
377379
verify-benchmark-results-tpcds:
378380
needs: build-native
379381
name: Verify TPC-DS Results (${{ matrix.join }})
380-
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', 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' }}
381383
container:
382384
image: amd64/rust
383385
strategy:
@@ -396,7 +398,7 @@ jobs:
396398
jdk-version: 11
397399

398400
- name: Download native library
399-
uses: actions/download-artifact@v7
401+
uses: actions/download-artifact@v8
400402
with:
401403
name: native-lib-linux
402404
path: native/target/release/

.github/workflows/pr_build_macos.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
branches:
2727
- main
2828
paths-ignore:
29+
- "benchmarks/**"
2930
- "doc/**"
3031
- "docs/**"
3132
- "**.md"
@@ -34,6 +35,7 @@ on:
3435
- "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
3536
pull_request:
3637
paths-ignore:
38+
- "benchmarks/**"
3739
- "doc/**"
3840
- "docs/**"
3941
- "**.md"
@@ -100,7 +102,7 @@ jobs:
100102
RUSTFLAGS: "-Ctarget-cpu=apple-m1"
101103

102104
- name: Upload native library
103-
uses: actions/upload-artifact@v6
105+
uses: actions/upload-artifact@v7
104106
with:
105107
name: native-lib-macos
106108
path: native/target/ci/libcomet.dylib
@@ -231,7 +233,7 @@ jobs:
231233
protoc-architecture: aarch_64
232234

233235
- name: Download native library
234-
uses: actions/download-artifact@v7
236+
uses: actions/download-artifact@v8
235237
with:
236238
name: native-lib-macos
237239
# Download to release/ since Maven's -Prelease expects libcomet.dylib there

.github/workflows/spark_sql_test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ on:
2626
branches:
2727
- main
2828
paths-ignore:
29+
- "benchmarks/**"
2930
- "doc/**"
3031
- "docs/**"
3132
- "**.md"
@@ -34,6 +35,7 @@ on:
3435
- "spark/src/test/scala/org/apache/spark/sql/benchmark/**"
3536
pull_request:
3637
paths-ignore:
38+
- "benchmarks/**"
3739
- "doc/**"
3840
- "docs/**"
3941
- "**.md"
@@ -89,7 +91,7 @@ jobs:
8991
RUSTFLAGS: "-Ctarget-cpu=x86-64-v3"
9092

9193
- name: Upload native library
92-
uses: actions/upload-artifact@v6
94+
uses: actions/upload-artifact@v7
9395
with:
9496
name: native-lib-linux
9597
path: native/target/ci/libcomet.so
@@ -143,7 +145,7 @@ jobs:
143145
rust-version: ${{env.RUST_VERSION}}
144146
jdk-version: ${{ matrix.config.java }}
145147
- name: Download native library
146-
uses: actions/download-artifact@v7
148+
uses: actions/download-artifact@v8
147149
with:
148150
name: native-lib-linux
149151
path: native/target/release/
@@ -166,7 +168,7 @@ jobs:
166168
LC_ALL: "C.UTF-8"
167169
- name: Upload fallback log
168170
if: ${{ github.event.inputs.collect-fallback-logs == 'true' }}
169-
uses: actions/upload-artifact@v6
171+
uses: actions/upload-artifact@v7
170172
with:
171173
name: fallback-log-spark-sql-${{ matrix.config.scan-impl }}-${{ matrix.module.name }}-spark-${{ matrix.config.spark-full }}
172174
path: "**/fallback.log"
@@ -178,14 +180,14 @@ jobs:
178180
runs-on: ubuntu-24.04
179181
steps:
180182
- name: Download fallback log artifacts
181-
uses: actions/download-artifact@v7
183+
uses: actions/download-artifact@v8
182184
with:
183185
path: fallback-logs/
184186
- name: Merge fallback logs
185187
run: |
186188
find ./fallback-logs/ -type f -name "fallback.log" -print0 | xargs -0 cat | sort -u > all_fallback.log
187189
- name: Upload merged fallback log
188-
uses: actions/upload-artifact@v6
190+
uses: actions/upload-artifact@v7
189191
with:
190192
name: all-fallback-log
191193
path: all_fallback.log

0 commit comments

Comments
 (0)