Skip to content

Commit 31a07ca

Browse files
committed
Merge remote-tracking branch 'origin/main' into arrow-avro
# Conflicts: # Cargo.lock # Cargo.toml # datafusion/core/src/datasource/file_format/avro.rs # datafusion/datasource-avro/src/avro_to_arrow/schema.rs # datafusion/datasource-avro/src/source.rs
2 parents 9da2388 + ca904b3 commit 31a07ca

File tree

731 files changed

+52103
-17923
lines changed

Some content is hidden

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

731 files changed

+52103
-17923
lines changed

.asf.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ github:
6262
branch-51:
6363
required_pull_request_reviews:
6464
required_approving_review_count: 1
65+
branch-52:
66+
required_pull_request_reviews:
67+
required_approving_review_count: 1
6568
pull_requests:
6669
# enable updating head branches of pull requests
6770
allow_update_branch: true

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ updates:
2323
interval: weekly
2424
target-branch: main
2525
labels: [auto-dependencies]
26+
open-pull-requests-limit: 15
2627
ignore:
2728
# major version bumps of arrow* and parquet are handled manually
2829
- dependency-name: "arrow*"

.github/workflows/audit.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@d850aa816998e5cf15f67a78c7b933f2a5033f8a # v2.63.3
45+
uses: taiki-e/install-action@2e9d707ef49c9b094d45955b60c7e5c0dfedeb14 # v2.66.5
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check
49+
# Note: you can ignore specific RUSTSEC issues using the `--ignore` flag ,for example:
50+
# run: cargo audit --ignore RUSTSEC-2026-0001
4951
run: cargo audit

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ jobs:
6666
- name: Install cargo-machete
6767
run: cargo install cargo-machete --version ^0.9 --locked
6868
- name: Detect unused dependencies
69-
run: cargo machete --with-metadata
69+
run: cargo machete --with-metadata

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
steps:
4646
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
47-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
47+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
4848
with:
4949
node-version: "20"
5050
- name: Prettier check

.github/workflows/docs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ jobs:
5151
python3 -m venv venv
5252
source venv/bin/activate
5353
pip install -r docs/requirements.txt
54+
- name: Install dependency graph tooling
55+
run: |
56+
set -x
57+
sudo apt-get update
58+
sudo apt-get install -y graphviz
59+
cargo install cargo-depgraph --version ^1.6 --locked
5460
5561
- name: Build docs
5662
run: |

.github/workflows/docs_pr.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,15 @@ jobs:
5454
python3 -m venv venv
5555
source venv/bin/activate
5656
pip install -r docs/requirements.txt
57+
- name: Install dependency graph tooling
58+
run: |
59+
set -x
60+
sudo apt-get update
61+
sudo apt-get install -y graphviz
62+
cargo install cargo-depgraph --version ^1.6 --locked
5763
- name: Build docs html and check for warnings
5864
run: |
5965
set -x
6066
source venv/bin/activate
6167
cd docs
6268
./build.sh # fails on errors
63-

.github/workflows/rust.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ jobs:
421421
sudo apt-get update -qq
422422
sudo apt-get install -y -qq clang
423423
- name: Setup wasm-pack
424-
uses: taiki-e/install-action@d850aa816998e5cf15f67a78c7b933f2a5033f8a # v2.63.3
424+
uses: taiki-e/install-action@2e9d707ef49c9b094d45955b60c7e5c0dfedeb14 # v2.66.5
425425
with:
426426
tool: wasm-pack
427427
- name: Run tests with headless mode
@@ -695,7 +695,7 @@ jobs:
695695
uses: ./.github/actions/setup-builder
696696
with:
697697
rust-version: stable
698-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
698+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
699699
with:
700700
node-version: "20"
701701
- name: Check if configs.md has been modified
@@ -709,6 +709,23 @@ jobs:
709709
./dev/update_function_docs.sh
710710
git diff --exit-code
711711
712+
examples-docs-check:
713+
name: check example README is up-to-date
714+
needs: linux-build-lib
715+
runs-on: ubuntu-latest
716+
container:
717+
image: amd64/rust
718+
719+
steps:
720+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
721+
with:
722+
submodules: true
723+
fetch-depth: 1
724+
725+
- name: Run examples docs check script
726+
run: |
727+
bash ci/scripts/check_examples_docs.sh
728+
712729
# Verify MSRV for the crates which are directly used by other projects:
713730
# - datafusion
714731
# - datafusion-substrait
@@ -724,7 +741,7 @@ jobs:
724741
- name: Setup Rust toolchain
725742
uses: ./.github/actions/setup-builder
726743
- name: Install cargo-msrv
727-
uses: taiki-e/install-action@d850aa816998e5cf15f67a78c7b933f2a5033f8a # v2.63.3
744+
uses: taiki-e/install-action@2e9d707ef49c9b094d45955b60c7e5c0dfedeb14 # v2.66.5
728745
with:
729746
tool: cargo-msrv
730747

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache DataFusion
2-
Copyright 2019-2025 The Apache Software Foundation
2+
Copyright 2019-2026 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

benchmarks/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ mimalloc_extended = ["libmimalloc-sys/extended"]
4040

4141
[dependencies]
4242
arrow = { workspace = true }
43+
clap = { version = "4.5.53", features = ["derive"] }
4344
datafusion = { workspace = true, default-features = true }
4445
datafusion-common = { workspace = true, default-features = true }
4546
env_logger = { workspace = true }
@@ -54,7 +55,6 @@ regex.workspace = true
5455
serde = { version = "1.0.228", features = ["derive"] }
5556
serde_json = { workspace = true }
5657
snmalloc-rs = { version = "0.3", optional = true }
57-
structopt = { version = "0.3", default-features = false }
5858
tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
5959
tokio-util = { version = "0.7.17" }
6060

0 commit comments

Comments
 (0)