diff --git a/Cargo.lock b/Cargo.lock index 77240ea27..2cdb8d203 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -591,8 +591,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "7.0.0" -source = "git+https://github.com/jonmmease/arrow-datafusion.git?rev=f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b#f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8174c458d0266ba442038160fad2c98f02924e6179d6d46175f600b69abb5bb7" dependencies = [ "ahash", "arrow", @@ -602,6 +603,7 @@ dependencies = [ "datafusion-data-access", "datafusion-expr", "datafusion-physical-expr", + "datafusion-row", "futures", "hashbrown 0.12.0", "lazy_static", @@ -623,8 +625,9 @@ dependencies = [ [[package]] name = "datafusion-common" -version = "7.0.0" -source = "git+https://github.com/jonmmease/arrow-datafusion.git?rev=f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b#f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c687e12a58d1499b19ee899fa467d122c8cc9223570af6f3eb3c4d9d9be929b" dependencies = [ "arrow", "ordered-float 3.0.0", @@ -634,8 +637,9 @@ dependencies = [ [[package]] name = "datafusion-data-access" -version = "1.0.0" -source = "git+https://github.com/jonmmease/arrow-datafusion.git?rev=f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b#f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cca9e1200ddd362d97f22d185e98995ebd3737d2b3d69a200a06a5099fa699a" dependencies = [ "async-trait", "chrono", @@ -648,8 +652,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "7.0.0" -source = "git+https://github.com/jonmmease/arrow-datafusion.git?rev=f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b#f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d20909d70931b88605b6f121c0ed820cec1d5b802cb51b7b5759f0421be3add8" dependencies = [ "ahash", "arrow", @@ -659,8 +664,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "7.0.0" -source = "git+https://github.com/jonmmease/arrow-datafusion.git?rev=f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b#f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9083cb20b57216430d5b8e52341782d9520ce77e65c60803e330fd09bdfa6e" dependencies = [ "ahash", "arrow", @@ -669,6 +675,7 @@ dependencies = [ "chrono", "datafusion-common", "datafusion-expr", + "datafusion-row", "hashbrown 0.12.0", "lazy_static", "md-5", @@ -680,6 +687,18 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "datafusion-row" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f649a2021eefef44e0bef6782d053148b2fef74db7592fecfe87e042d52947a" +dependencies = [ + "arrow", + "datafusion-common", + "paste", + "rand", +] + [[package]] name = "deterministic-hash" version = "1.0.1" @@ -2493,9 +2512,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "sqlparser" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9a527b68048eb95495a1508f6c8395c8defcff5ecdbe8ad4106d08a2ef2a3c" +checksum = "ddc2739f3a9bfc68e2f7b7695589f6cb0181c88af73ceaee0c84215cd2a2ae28" dependencies = [ "log", ] diff --git a/vegafusion-core/Cargo.toml b/vegafusion-core/Cargo.toml index e7bf28404..7966d4ea3 100644 --- a/vegafusion-core/Cargo.toml +++ b/vegafusion-core/Cargo.toml @@ -27,8 +27,7 @@ default_features = false features = [ "ipc",] [dependencies.datafusion-common] -git = "https://github.com/jonmmease/arrow-datafusion.git" -rev = "f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" [dependencies.pyo3] version = "0.16.4" diff --git a/vegafusion-rt-datafusion/Cargo.toml b/vegafusion-rt-datafusion/Cargo.toml index afae054e4..6eabee066 100644 --- a/vegafusion-rt-datafusion/Cargo.toml +++ b/vegafusion-rt-datafusion/Cargo.toml @@ -46,12 +46,10 @@ version = "1.0.137" features = [ "derive",] [dependencies.datafusion] -git = "https://github.com/jonmmease/arrow-datafusion.git" -rev = "f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" [dependencies.datafusion-expr] -git = "https://github.com/jonmmease/arrow-datafusion.git" -rev = "f3e87d8dde2ffb1d622fc30d53a1330b335dbc9b" +version = "8.0.0" [dependencies.tokio] version = "1.18.1" diff --git a/vegafusion-rt-datafusion/tests/test_transform_aggregate.rs b/vegafusion-rt-datafusion/tests/test_transform_aggregate.rs index 3a26cbd18..16dbd5b2b 100644 --- a/vegafusion-rt-datafusion/tests/test_transform_aggregate.rs +++ b/vegafusion-rt-datafusion/tests/test_transform_aggregate.rs @@ -154,7 +154,7 @@ fn test_bin_aggregate() { Some(Field::String("Beak Depth (mm)".to_string())), Some(Field::String("Flipper Length (mm)".to_string())), ]), - ops: Some(vec![AggregateOpSpec::Mean, AggregateOpSpec::Max]), + ops: Some(vec![AggregateOpSpec::Min, AggregateOpSpec::Max]), as_: None, cross: None, drop: None,