Skip to content

Commit cd898df

Browse files
authored
Merge branch 'main' into ndv-equality-filter
2 parents a842863 + 5b0938d commit cd898df

79 files changed

Lines changed: 3840 additions & 856 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.

.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@0d865d5cc6d507df4765f1f866bfae8bab4e2a73 # v2.69.7
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
persist-credentials: false
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # 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@38697555549f1db7851b81482ff19f1fa5c4fedc # v4
53+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4
5454
with:
5555
category: "/language:actions"

.github/workflows/dev.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
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' }}
6565
# note: do not use amd/rust container to preserve disk space
6666
steps:
67-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
67+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
6868
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6969
with:
7070
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
@@ -91,7 +91,7 @@ jobs:
9191
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' }}
9292
# note: do not use amd/rust container to preserve disk space
9393
steps:
94-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
94+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
9595
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9696
with:
9797
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
@@ -138,7 +138,7 @@ jobs:
138138
container:
139139
image: amd64/rust
140140
steps:
141-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
141+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
142142
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
143143
with:
144144
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
@@ -160,7 +160,7 @@ jobs:
160160
container:
161161
image: amd64/rust
162162
steps:
163-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
163+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
164164
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
165165
with:
166166
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push

.github/workflows/rust.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
container:
5252
image: amd64/rust
5353
steps:
54-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
54+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
5555
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5656
- name: Setup Rust toolchain
5757
uses: ./.github/actions/setup-builder
@@ -142,7 +142,7 @@ jobs:
142142
container:
143143
image: amd64/rust
144144
steps:
145-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
145+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
146146
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
147147
- name: Setup Rust toolchain
148148
uses: ./.github/actions/setup-builder
@@ -174,7 +174,7 @@ jobs:
174174
container:
175175
image: amd64/rust
176176
steps:
177-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
177+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
178178
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
179179
- name: Setup Rust toolchain
180180
uses: ./.github/actions/setup-builder
@@ -277,7 +277,7 @@ jobs:
277277
volumes:
278278
- /usr/local:/host/usr/local
279279
steps:
280-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
280+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
281281
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
282282
with:
283283
submodules: true
@@ -305,7 +305,7 @@ jobs:
305305
--lib \
306306
--tests \
307307
--bins \
308-
--features serde,avro,json,backtrace,integration-tests,parquet_encryption
308+
--features serde,avro,json,backtrace,integration-tests,parquet_encryption,substrait
309309
- name: Verify Working Directory Clean
310310
run: git diff --exit-code
311311
# Check no temporary directories created during test.
@@ -324,7 +324,7 @@ jobs:
324324
needs: linux-build-lib
325325
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' }}
326326
steps:
327-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
327+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
328328
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
329329
with:
330330
submodules: true
@@ -356,7 +356,7 @@ jobs:
356356
container:
357357
image: amd64/rust
358358
steps:
359-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
359+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
360360
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
361361
with:
362362
submodules: true
@@ -387,7 +387,7 @@ jobs:
387387
container:
388388
image: amd64/rust
389389
steps:
390-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
390+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
391391
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
392392
with:
393393
submodules: true
@@ -409,7 +409,7 @@ jobs:
409409
container:
410410
image: amd64/rust
411411
steps:
412-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
412+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
413413
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
414414
- name: Setup Rust toolchain
415415
uses: ./.github/actions/setup-builder
@@ -431,7 +431,7 @@ jobs:
431431
sudo apt-get update -qq
432432
sudo apt-get install -y -qq clang
433433
- name: Setup wasm-pack
434-
uses: taiki-e/install-action@0d865d5cc6d507df4765f1f866bfae8bab4e2a73 # v2.69.7
434+
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
435435
with:
436436
tool: wasm-pack
437437
- name: Run tests with headless mode
@@ -450,7 +450,7 @@ jobs:
450450
container:
451451
image: amd64/rust
452452
steps:
453-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
453+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
454454
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
455455
with:
456456
submodules: true
@@ -473,7 +473,7 @@ jobs:
473473
export RUST_MIN_STACK=20971520
474474
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
475475
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
476+
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption,substrait --profile ci --package datafusion-sqllogictest --test sqllogictests
477477
- name: Verify Working Directory Clean
478478
run: git diff --exit-code
479479

@@ -498,7 +498,7 @@ jobs:
498498
--health-timeout 5s
499499
--health-retries 5
500500
steps:
501-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
501+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
502502
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
503503
with:
504504
submodules: true
@@ -523,7 +523,7 @@ jobs:
523523
container:
524524
image: amd64/rust
525525
steps:
526-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
526+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
527527
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
528528
with:
529529
submodules: true
@@ -537,7 +537,7 @@ jobs:
537537
# command cannot be run for all the .slt files. Run it for just one that works (limit.slt)
538538
# until most of the tickets in https://github.com/apache/datafusion/issues/16248 are addressed
539539
# and this command can be run without filters.
540-
run: cargo test --test sqllogictests -- --substrait-round-trip limit.slt
540+
run: cargo test -p datafusion-sqllogictest --test sqllogictests --features substrait -- --substrait-round-trip limit.slt
541541

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

575575
vendor:
576576
name: Verify Vendored Code
@@ -654,7 +654,7 @@ jobs:
654654
container:
655655
image: amd64/rust
656656
steps:
657-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
657+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
658658
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
659659
with:
660660
submodules: true
@@ -701,7 +701,7 @@ jobs:
701701
container:
702702
image: amd64/rust
703703
steps:
704-
- uses: runs-on/action@cd2b598b0515d39d78c38a02d529db87d2196d1e # v2.0.3
704+
- uses: runs-on/action@742bf56072eb4845a0f94b3394673e4903c90ff0 # v2.1.0
705705
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
706706
with:
707707
submodules: true
@@ -771,7 +771,7 @@ jobs:
771771
- name: Setup Rust toolchain
772772
uses: ./.github/actions/setup-builder
773773
- name: Install cargo-msrv
774-
uses: taiki-e/install-action@0d865d5cc6d507df4765f1f866bfae8bab4e2a73 # v2.69.7
774+
uses: taiki-e/install-action@6ef672efc2b5aabc787a9e94baf4989aa02a97df # v2.70.3
775775
with:
776776
tool: cargo-msrv
777777

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,6 @@ datafusion-examples/examples/datafusion-examples/
7878

7979
# Samply profile data
8080
profile.json.gz
81+
82+
# Claude Code personal settings
83+
.claude/settings.local.json

0 commit comments

Comments
 (0)