Skip to content

bump to df 52 #5717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
a10y wants to merge 5 commits into from
Closed

bump to df 52 #5717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75bebe9
Fix conflicts
AdamGS Dec 8, 2025
cb25f3c
Patch tpchgen
AdamGS Dec 9, 2025
83c2c6b
bump to df 52
a10y Dec 12, 2025
9064f59
carry stuff over from the other branch
a10y Dec 12, 2025
253f1c5
many fixes
a10y Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,968 changes: 949 additions & 4,019 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 45 additions & 32 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
members = [
"bench-vortex",
# "bench-vortex",
"encodings/*",
"fuzz",
"vortex",
Expand All @@ -11,7 +11,7 @@ members = [
"vortex-cxx",
"vortex-datafusion",
"vortex-dtype",
"vortex-duckdb",
# "vortex-duckdb",
"vortex-error",
"vortex-ffi",
"vortex-file",
Expand Down Expand Up @@ -61,16 +61,16 @@ anyhow = "1.0.95"
arbitrary = "1.3.2"
arcref = "0.2.0"
arrayref = "0.3.7"
arrow-arith = "56"
arrow-array = "56"
arrow-buffer = "56"
arrow-cast = "56"
arrow-data = "56"
arrow-ipc = "56"
arrow-ord = "56"
arrow-schema = "56"
arrow-select = "56"
arrow-string = "56"
arrow-arith = "57"
arrow-array = "57"
arrow-buffer = "57"
arrow-cast = "57"
arrow-data = "57"
arrow-ipc = "57"
arrow-ord = "57"
arrow-schema = "57"
arrow-select = "57"
arrow-string = "57"
async-compat = "0.2.5"
async-fs = "2.2.0"
async-stream = "0.3.6"
Expand All @@ -83,7 +83,7 @@ bzip2 = "0.6.0"
cbindgen = "0.29.0"
cc = "1.2"
cfg-if = "1"
chrono = "0.4.41"
chrono = "0.4.42"
clap = "4.5"
crossbeam-deque = "0.8.6"
crossbeam-queue = "0.3.12"
Expand All @@ -97,19 +97,19 @@ cudarc = { version = "0.18.0", features = [
"nvrtc",
], default-features = false }
dashmap = "6.1.0"
datafusion = { version = "50", default-features = false }
datafusion-catalog = { version = "50" }
datafusion-common = { version = "50" }
datafusion-common-runtime = { version = "50" }
datafusion-datasource = { version = "50", default-features = false }
datafusion-execution = { version = "50" }
datafusion-expr = { version = "50" }
datafusion-functions = { version = "50" }
datafusion-physical-expr = { version = "50" }
datafusion-physical-expr-adapter = { version = "50" }
datafusion-physical-expr-common = { version = "50" }
datafusion-physical-plan = { version = "50" }
datafusion-pruning = { version = "50" }
datafusion = { version = "51", default-features = false, features = ["sql"] }
datafusion-catalog = { version = "51" }
datafusion-common = { version = "51" }
datafusion-common-runtime = { version = "51" }
datafusion-datasource = { version = "51", default-features = false }
datafusion-execution = { version = "51" }
datafusion-expr = { version = "51" }
datafusion-functions = { version = "51" }
datafusion-physical-expr = { version = "51" }
datafusion-physical-expr-adapter = { version = "51" }
datafusion-physical-expr-common = { version = "51" }
datafusion-physical-plan = { version = "51" }
datafusion-pruning = { version = "51" }
dirs = "6.0.0"
divan = { package = "codspeed-divan-compat", version = "4.0.4" }
dyn-hash = "1.0.0"
Expand All @@ -123,7 +123,7 @@ futures = { version = "0.3.31", default-features = false }
fuzzy-matcher = "0.3"
glob = "0.3.2"
goldenfile = "1"
half = { version = "2.6", features = ["std", "num-traits"] }
half = { version = "2.7.1", features = ["std", "num-traits"] }
hashbrown = "0.16.0"
humansize = "2.1.3"
indicatif = "0.18.0"
Expand All @@ -144,14 +144,14 @@ noodles-bgzf = "0.44.0"
noodles-vcf = "0.82.0"
num-traits = "0.2.19"
num_enum = { version = "0.7.3", default-features = false }
object_store = { version = "0.12.3", default-features = false }
object_store = { version = "0.12.4", default-features = false }
once_cell = "1.21"
oneshot = "0.1.11"
opentelemetry = "0.31.0"
opentelemetry-otlp = "0.31.0"
opentelemetry_sdk = "0.31.0"
parking_lot = { version = "0.12.3", features = ["nightly"] }
parquet = "56"
parquet = "57"
paste = "1.0.15"
pco = "0.4.4"
pin-project-lite = "0.2.15"
Expand Down Expand Up @@ -198,11 +198,9 @@ target-lexicon = "0.13"
tempfile = "3"
termtree = { version = "0.5" }
thiserror = "2.0.3"
tokio = { version = "1.47" }
tokio = { version = "1.48" }
tokio-stream = "0.1.17"
tokio-util = { version = "0.7.16" }
tpchgen = { version = "2" }
tpchgen-arrow = { version = "2" }
tracing = { version = "0.1.41" }
tracing-perfetto = "0.1.5"
tracing-subscriber = "0.3.20"
Expand Down Expand Up @@ -341,3 +339,18 @@ lto = false
[profile.bench_assert]
debug-assertions = true
inherits = "bench"

[patch.crates-io]
datafusion = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-catalog = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-common = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-common-runtime = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-datasource = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-execution = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-expr = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-functions = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-physical-expr = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-physical-expr-adapter = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-physical-plan = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
datafusion-pruning = { git = "https://github.com/apache/datafusion", rev = "86011519b5a" }
4 changes: 2 additions & 2 deletions bench-vortex/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ tempfile = { workspace = true }
tokio = { workspace = true, features = ["full"] }
tokio-stream = { workspace = true }
tokio-util = { workspace = true }
tpchgen = { workspace = true }
tpchgen-arrow = { workspace = true }
tpchgen = { git = "https://github.com/clflushopt/tpchgen-rs.git", rev = "c38f69b0dc84c4b7edfad349d1a9cd1a134b8018" }
tpchgen-arrow = { git = "https://github.com/clflushopt/tpchgen-rs.git", rev = "c38f69b0dc84c4b7edfad349d1a9cd1a134b8018" }
tracing = { workspace = true }
tracing-perfetto = { workspace = true }
tracing-subscriber = { workspace = true, features = [
Expand Down
2 changes: 1 addition & 1 deletion bench-vortex/src/public_bi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ impl PBIData {
ListingOptions::new(df_format)
.with_session_config_options(session.state().config()),
)
.with_schema(schema.into());
.with_schema(schema.inner().clone());

let listing_table = Arc::new(ListingTable::try_new(config)?);
session.register_table(table_ref, listing_table)?;
Expand Down
Loading
Loading