Skip to content

Commit 288817b

Browse files
Merge branch 'main' into gene.bordegaray/2025/10/avoid_consecutive_repartition_exec
2 parents d66b393 + a5eb912 commit 288817b

File tree

211 files changed

+3094
-1165
lines changed

Some content is hidden

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

211 files changed

+3094
-1165
lines changed

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@81ecf985428d5c2ea81dbf079bceca32bc9604ab # v2.62.43
45+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/extended.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
--lib \
125125
--tests \
126126
--bins \
127-
--features avro,json,backtrace,extended_tests,recursive_protection
127+
--features avro,json,backtrace,extended_tests,recursive_protection,parquet_encryption
128128
- name: Verify Working Directory Clean
129129
run: git diff --exit-code
130130
- name: Cleanup
@@ -169,7 +169,7 @@ jobs:
169169
rust-version: stable
170170
- name: Run sqllogictest
171171
run: |
172-
cargo test --features backtrace --profile release-nonlto --test sqllogictests -- --include-sqlite
172+
cargo test --features backtrace,parquet_encryption --profile release-nonlto --test sqllogictests -- --include-sqlite
173173
cargo clean
174174
175175

.github/workflows/rust.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ jobs:
434434
sudo apt-get update -qq
435435
sudo apt-get install -y -qq clang
436436
- name: Setup wasm-pack
437-
uses: taiki-e/install-action@81ecf985428d5c2ea81dbf079bceca32bc9604ab # v2.62.43
437+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
438438
with:
439439
tool: wasm-pack
440440
- name: Run tests with headless mode
@@ -475,7 +475,7 @@ jobs:
475475
export RUST_MIN_STACK=20971520
476476
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
477477
cargo test plan_q --package datafusion-benchmarks --profile ci --features=ci -- --test-threads=1
478-
INCLUDE_TPCH=true cargo test --features backtrace --profile ci --package datafusion-sqllogictest --test sqllogictests
478+
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption --profile ci --package datafusion-sqllogictest --test sqllogictests
479479
- name: Verify Working Directory Clean
480480
run: git diff --exit-code
481481

@@ -761,7 +761,7 @@ jobs:
761761
- name: Setup Rust toolchain
762762
uses: ./.github/actions/setup-builder
763763
- name: Install cargo-msrv
764-
uses: taiki-e/install-action@81ecf985428d5c2ea81dbf079bceca32bc9604ab # v2.62.43
764+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
765765
with:
766766
tool: cargo-msrv
767767

@@ -806,4 +806,4 @@ jobs:
806806
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
807807
with:
808808
persist-credentials: false
809-
- uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1 # v1.38.1
809+
- uses: crate-ci/typos@07d900b8fa1097806b8adb6391b0d3e0ac2fdea7 # v1.39.0

Cargo.lock

Lines changed: 41 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ async-trait = "0.1.89"
108108
bigdecimal = "0.4.8"
109109
bytes = "1.10"
110110
chrono = { version = "0.4.42", default-features = false }
111-
criterion = "0.5.1"
112-
ctor = "0.4.3"
111+
criterion = "0.7"
112+
ctor = "0.6.1"
113113
dashmap = "6.0.1"
114114
datafusion = { path = "datafusion/core", version = "50.3.0", default-features = false }
115115
datafusion-catalog = { path = "datafusion/catalog", version = "50.3.0" }
@@ -174,7 +174,7 @@ prost = "0.14.1"
174174
rand = "0.9"
175175
recursive = "0.1.1"
176176
regex = "1.12"
177-
rstest = "0.25.0"
177+
rstest = "0.26.1"
178178
serde_json = "1"
179179
sqlparser = { version = "0.59.0", default-features = false, features = ["std", "visitor"] }
180180
tempfile = "3"

0 commit comments

Comments
 (0)