Skip to content

Commit 69788c3

Browse files
committed
Merge branch 'main' into support-all-operator
2 parents 1c85a3f + c17c87c commit 69788c3

File tree

678 files changed

+28680
-11491
lines changed

Some content is hidden

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

678 files changed

+28680
-11491
lines changed

.asf.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ github:
5151
main:
5252
required_pull_request_reviews:
5353
required_approving_review_count: 1
54+
required_status_checks:
55+
contexts:
56+
- "Check License Header"
57+
- "Use prettier to check formatting of documents"
58+
- "Validate required_status_checks in .asf.yaml"
59+
- "Spell Check with Typos"
5460
# needs to be updated as part of the release process
5561
# .asf.yaml doesn't support wildcard branch protection rules, only exact branch names
5662
# https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#branch-protection

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@de6bbd1333b8f331563d54a051e542c7dfef81c3 # v2.68.34
45+
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ permissions:
3232
jobs:
3333
analyze:
3434
name: Analyze Actions
35-
runs-on: ubuntu-latest
35+
runs-on: ubuntu-slim
3636
permissions:
3737
contents: read
3838
security-events: write
@@ -45,11 +45,11 @@ jobs:
4545
persist-credentials: false
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4
48+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4
4949
with:
5050
languages: actions
5151

5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4
53+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4
5454
with:
5555
category: "/language:actions"

.github/workflows/dev.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
prettier:
4343
name: Use prettier to check formatting of documents
44-
runs-on: ubuntu-latest
44+
runs-on: ubuntu-slim
4545
steps:
4646
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4747
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
@@ -51,6 +51,14 @@ jobs:
5151
# if you encounter error, see instructions inside the script
5252
run: ci/scripts/doc_prettier_check.sh
5353

54+
asf-yaml-check:
55+
name: Validate required_status_checks in .asf.yaml
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
59+
- run: pip install pyyaml
60+
- run: python3 ci/scripts/check_asf_yaml_status_checks.py
61+
5462
typos:
5563
name: Spell Check with Typos
5664
runs-on: ubuntu-latest

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
path: asf-site
4242

4343
- name: Setup uv
44-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
44+
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
4545

4646
- name: Install dependencies
4747
run: uv sync --package datafusion-docs

.github/workflows/docs_pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
submodules: true
4646
fetch-depth: 1
4747
- name: Setup uv
48-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
48+
uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
4949
- name: Install doc dependencies
5050
run: uv sync --package datafusion-docs
5151
- name: Install dependency graph tooling

.github/workflows/extended.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,10 @@ on:
4444
- 'datafusion/physical*/**/*.rs'
4545
- 'datafusion/expr*/**/*.rs'
4646
- 'datafusion/optimizer/**/*.rs'
47+
- 'datafusion/sql/**/*.rs'
4748
- 'datafusion-testing'
4849
workflow_dispatch:
4950
inputs:
50-
pr_number:
51-
description: 'Pull request number'
52-
type: string
53-
check_run_id:
54-
description: 'Check run ID for status updates'
55-
type: string
5651
pr_head_sha:
5752
description: 'PR head SHA'
5853
type: string
@@ -69,7 +64,7 @@ jobs:
6964
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', github.run_id) || 'ubuntu-latest' }}
7065
# note: do not use amd/rust container to preserve disk space
7166
steps:
72-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
67+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
7368
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7469
with:
7570
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
@@ -93,11 +88,10 @@ jobs:
9388
linux-test-extended:
9489
name: cargo test 'extended_tests' (amd64)
9590
needs: [linux-build-lib]
96-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=32,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion,spot=false', github.run_id) || 'ubuntu-latest' }}
97-
# spot=false because the tests are long, https://runs-on.com/configuration/spot-instances/#disable-spot-pricing
91+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=32,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
9892
# note: do not use amd/rust container to preserve disk space
9993
steps:
100-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
94+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
10195
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
10296
with:
10397
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
@@ -144,7 +138,7 @@ jobs:
144138
container:
145139
image: amd64/rust
146140
steps:
147-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
141+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
148142
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
149143
with:
150144
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
@@ -162,12 +156,11 @@ jobs:
162156
163157
sqllogictest-sqlite:
164158
name: "Run sqllogictests with the sqlite test suite"
165-
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=48,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion,spot=false', github.run_id) || 'ubuntu-latest' }}
166-
# spot=false because the tests are long, https://runs-on.com/configuration/spot-instances/#disable-spot-pricing
159+
runs-on: ${{ github.repository_owner == 'apache' && format('runs-on={0},family=m8a+m7a+c8a,cpu=32,image=ubuntu24-full-x64,extras=s3-cache,disk=large,tag=datafusion', github.run_id) || 'ubuntu-latest' }}
167160
container:
168161
image: amd64/rust
169162
steps:
170-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
163+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
171164
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
172165
with:
173166
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ on:
3131
jobs:
3232
process:
3333
name: Process
34-
runs-on: ubuntu-latest
34+
runs-on: ubuntu-slim
3535
# only run for users whose permissions allow them to update PRs
3636
# otherwise labeler is failing:
3737
# https://github.com/apache/datafusion/issues/3743

.github/workflows/large_files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727

2828
jobs:
2929
check-files:
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-slim
3131
steps:
3232
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3333
with:

.github/workflows/rust.yml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ on:
3838
- "**.md"
3939
- ".github/ISSUE_TEMPLATE/**"
4040
- ".github/pull_request_template.md"
41-
merge_group:
4241
# manual trigger
4342
# https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
4443
workflow_dispatch:
@@ -51,7 +50,7 @@ jobs:
5150
container:
5251
image: amd64/rust
5352
steps:
54-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
53+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
5554
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5655
- name: Setup Rust toolchain
5756
uses: ./.github/actions/setup-builder
@@ -142,7 +141,7 @@ jobs:
142141
container:
143142
image: amd64/rust
144143
steps:
145-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
144+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
146145
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
147146
- name: Setup Rust toolchain
148147
uses: ./.github/actions/setup-builder
@@ -174,7 +173,7 @@ jobs:
174173
container:
175174
image: amd64/rust
176175
steps:
177-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
176+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
178177
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
179178
- name: Setup Rust toolchain
180179
uses: ./.github/actions/setup-builder
@@ -277,7 +276,7 @@ jobs:
277276
volumes:
278277
- /usr/local:/host/usr/local
279278
steps:
280-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
279+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
281280
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
282281
with:
283282
submodules: true
@@ -305,7 +304,7 @@ jobs:
305304
--lib \
306305
--tests \
307306
--bins \
308-
--features serde,avro,json,backtrace,integration-tests,parquet_encryption
307+
--features serde,avro,json,backtrace,integration-tests,parquet_encryption,substrait
309308
- name: Verify Working Directory Clean
310309
run: git diff --exit-code
311310
# Check no temporary directories created during test.
@@ -324,7 +323,7 @@ jobs:
324323
needs: linux-build-lib
325324
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', github.run_id) || 'ubuntu-latest' }}
326325
steps:
327-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
326+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
328327
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
329328
with:
330329
submodules: true
@@ -356,7 +355,7 @@ jobs:
356355
container:
357356
image: amd64/rust
358357
steps:
359-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
358+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
360359
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
361360
with:
362361
submodules: true
@@ -387,7 +386,7 @@ jobs:
387386
container:
388387
image: amd64/rust
389388
steps:
390-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
389+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
391390
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
392391
with:
393392
submodules: true
@@ -409,7 +408,7 @@ jobs:
409408
container:
410409
image: amd64/rust
411410
steps:
412-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
411+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
413412
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
414413
- name: Setup Rust toolchain
415414
uses: ./.github/actions/setup-builder
@@ -431,7 +430,7 @@ jobs:
431430
sudo apt-get update -qq
432431
sudo apt-get install -y -qq clang
433432
- name: Setup wasm-pack
434-
uses: taiki-e/install-action@de6bbd1333b8f331563d54a051e542c7dfef81c3 # v2.68.34
433+
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
435434
with:
436435
tool: wasm-pack
437436
- name: Run tests with headless mode
@@ -450,7 +449,7 @@ jobs:
450449
container:
451450
image: amd64/rust
452451
steps:
453-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
452+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
454453
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
455454
with:
456455
submodules: true
@@ -473,7 +472,7 @@ jobs:
473472
export RUST_MIN_STACK=20971520
474473
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
475474
cargo test plan_q --package datafusion-benchmarks --profile ci --features=ci -- --test-threads=1
476-
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption --profile ci --package datafusion-sqllogictest --test sqllogictests
475+
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption,substrait --profile ci --package datafusion-sqllogictest --test sqllogictests
477476
- name: Verify Working Directory Clean
478477
run: git diff --exit-code
479478

@@ -498,7 +497,7 @@ jobs:
498497
--health-timeout 5s
499498
--health-retries 5
500499
steps:
501-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
500+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
502501
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
503502
with:
504503
submodules: true
@@ -523,7 +522,7 @@ jobs:
523522
container:
524523
image: amd64/rust
525524
steps:
526-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
525+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
527526
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
528527
with:
529528
submodules: true
@@ -537,7 +536,7 @@ jobs:
537536
# command cannot be run for all the .slt files. Run it for just one that works (limit.slt)
538537
# until most of the tickets in https://github.com/apache/datafusion/issues/16248 are addressed
539538
# and this command can be run without filters.
540-
run: cargo test --test sqllogictests -- --substrait-round-trip limit.slt
539+
run: cargo test -p datafusion-sqllogictest --test sqllogictests --features substrait -- --substrait-round-trip limit.slt
541540

542541
# Temporarily commenting out the Windows flow, the reason is enormously slow running build
543542
# Waiting for new Windows 2025 github runner
@@ -570,7 +569,7 @@ jobs:
570569
uses: ./.github/actions/setup-macos-aarch64-builder
571570
- name: Run tests (excluding doctests)
572571
shell: bash
573-
run: cargo test --profile ci --exclude datafusion-cli --workspace --lib --tests --bins --features avro,json,backtrace,integration-tests
572+
run: cargo test --profile ci --exclude datafusion-cli --workspace --lib --tests --bins --features avro,json,backtrace,integration-tests,substrait
574573

575574
vendor:
576575
name: Verify Vendored Code
@@ -654,7 +653,7 @@ jobs:
654653
container:
655654
image: amd64/rust
656655
steps:
657-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
656+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
658657
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
659658
with:
660659
submodules: true
@@ -701,7 +700,7 @@ jobs:
701700
container:
702701
image: amd64/rust
703702
steps:
704-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
703+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
705704
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
706705
with:
707706
submodules: true
@@ -771,7 +770,7 @@ jobs:
771770
- name: Setup Rust toolchain
772771
uses: ./.github/actions/setup-builder
773772
- name: Install cargo-msrv
774-
uses: taiki-e/install-action@de6bbd1333b8f331563d54a051e542c7dfef81c3 # v2.68.34
773+
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
775774
with:
776775
tool: cargo-msrv
777776

0 commit comments

Comments
 (0)