Skip to content

Commit fb60ab9

Browse files
authored
Merge branch 'main' into fix-try-cast-proto-hooks
2 parents 1a0696b + 488a584 commit fb60ab9

151 files changed

Lines changed: 5671 additions & 1941 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/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ jobs:
471471
export RUST_MIN_STACK=20971520
472472
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
473473
cargo test plan_q --package datafusion-benchmarks --profile ci --features=ci -- --test-threads=1
474-
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption,substrait --profile ci --package datafusion-sqllogictest --test sqllogictests
474+
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption,substrait,memory-accounting --profile ci --package datafusion-sqllogictest --test sqllogictests -- --default-pool-size-mb 16384
475475
- name: Verify Working Directory Clean
476476
run: git diff --exit-code
477477

Cargo.lock

Lines changed: 1 addition & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

benchmarks/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ snmalloc = ["snmalloc-rs"]
4040
mimalloc_extended = ["libmimalloc-sys/extended"]
4141

4242
[dependencies]
43-
anstream = "1.0"
4443
arrow = { workspace = true }
4544
async-trait = "0.1"
4645
bytes = { workspace = true }
47-
clap = { version = "4.6.1", features = ["derive", "env", "color"] }
46+
clap = { version = "4.6.0", features = ["derive", "env"] }
4847
criterion = { workspace = true, features = ["html_reports"] }
4948
datafusion = { workspace = true, default-features = true }
5049
datafusion-common = { workspace = true, default-features = true }
@@ -62,7 +61,6 @@ serde_json = { workspace = true }
6261
snmalloc-rs = { version = "0.7", optional = true }
6362
tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
6463
tokio-util = { version = "0.7.17" }
65-
toml = "1.1"
6664

6765
[dev-dependencies]
6866
datafusion-proto = { workspace = true }

benchmarks/sql_benchmarks/tpch/tpch.suite

Lines changed: 0 additions & 16 deletions
This file was deleted.

benchmarks/src/benchmark_runner/cli.rs

Lines changed: 0 additions & 81 deletions
This file was deleted.

benchmarks/src/benchmark_runner/mod.rs

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)