Skip to content

Commit f514610

Browse files
AdamGS0ax1
andauthored
Datafusion 46 (#2417)
I mostly just like to see changes in Github. We can merge this once Datafusion 46 released, assuming it includes the following PRs: - apache/datafusion#14754 - apache/datafusion#14671 - also hoping for apache/datafusion#14798 Seems like everything we wanted to get in made it, this branch now compiles AND passes all checks, so we're only waiting for the actual release in apache/datafusion#14123 --------- Co-authored-by: Alexander Droste <[email protected]>
1 parent 9f331e1 commit f514610

File tree

13 files changed

+553
-477
lines changed

13 files changed

+553
-477
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,32 +53,32 @@ version = "0.25.2"
5353
anyhow = "1.0.95"
5454
arbitrary = "1.3.2"
5555
arrayref = "0.3.7"
56-
arrow = "54.2"
57-
arrow-arith = "54.2"
58-
arrow-array = "54.2"
59-
arrow-buffer = "54.2"
60-
arrow-cast = "54.2"
61-
arrow-ord = "54.2"
62-
arrow-schema = "54.2"
63-
arrow-select = "54.2"
64-
arrow-string = "54.2"
56+
arrow = "54.2.1"
57+
arrow-arith = "54.2.1"
58+
arrow-array = "54.2.1"
59+
arrow-buffer = "54.2.1"
60+
arrow-cast = "54.2.1"
61+
arrow-ord = "54.2.1"
62+
arrow-schema = "54.2.1"
63+
arrow-select = "54.2.1"
64+
arrow-string = "54.2.1"
6565
async-once-cell = "0.5.4"
6666
async-trait = "0.1.86"
6767
backtrace = "0.3.74"
6868
bit-vec = "0.8.0"
69-
bytes = "1.9"
69+
bytes = "1.10"
7070
bzip2 = "0.5.0"
7171
cfg-if = "1"
7272
chrono = "0.4.38"
7373
clap = "4"
7474
compio = { version = "0.13", features = ["io-uring"], default-features = false }
7575
crossterm = "0.28"
76-
datafusion = { version = "45", default-features = false }
77-
datafusion-common = { version = "45", default-features = false }
78-
datafusion-execution = "45"
79-
datafusion-expr = "45"
80-
datafusion-physical-expr = "45"
81-
datafusion-physical-plan = "45"
76+
datafusion = { version = "46", default-features = false }
77+
datafusion-common = { version = "46" }
78+
datafusion-execution = { version = "46" }
79+
datafusion-expr = { version = "46" }
80+
datafusion-physical-expr = { version = "46" }
81+
datafusion-physical-plan = { version = "46" }
8282
divan = { package = "codspeed-divan-compat", version = "2.8.0" }
8383
dyn-hash = "0.2.0"
8484
enum-iterator = "2.0.0"
@@ -113,7 +113,7 @@ opentelemetry = "0.28.0"
113113
opentelemetry-otlp = "0.28.0"
114114
opentelemetry_sdk = "0.28.0"
115115
parking_lot = "0.12.3"
116-
parquet = "54.2"
116+
parquet = "54.2.1"
117117
paste = "1.0.15"
118118
pin-project = "1.1.5"
119119
pin-project-lite = "0.2.15"
@@ -153,13 +153,14 @@ tar = "0.4"
153153
tempfile = "3"
154154
thiserror = "2.0.3"
155155
tikv-jemallocator = "0.6"
156-
tokio = "1.36"
156+
tokio = "1.43"
157+
tokio-stream = "0.1.17"
157158
tracing = { version = "0.1.41" }
158159
tracing-chrome = "0.7.2"
159160
tracing-futures = "0.2.5"
160161
tracing-subscriber = "0.3.19"
161162
url = "2.5.4"
162-
uuid = { version = "1.14", features = ["js"] }
163+
uuid = { version = "1.15", features = ["js"] }
163164
wasm-bindgen-futures = "0.4.39"
164165
witchcraft-metrics = "1.0.1"
165166

vortex-datafusion/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ object_store = { workspace = true }
3232
pin-project = { workspace = true }
3333
rand = { workspace = true }
3434
tokio = { workspace = true, features = ["rt-multi-thread", "fs"] }
35+
tokio-stream = { workspace = true }
3536
tracing = { workspace = true, optional = true }
3637
tracing-futures = { workspace = true, features = [
3738
"futures-03",

vortex-datafusion/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! Connectors to enable DataFusion to read Vortex data.
22
#![deny(missing_docs)]
3-
#![allow(clippy::nonminimal_bool)]
43
#![allow(clippy::cast_possible_truncation)]
54

65
use std::fmt::Debug;

vortex-datafusion/src/memory/provider.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ mod test {
185185
use arrow_schema::{DataType, Field, Schema};
186186
use datafusion::functions_aggregate::count::count_distinct;
187187
use datafusion::prelude::SessionContext;
188-
use datafusion_common::{Column, TableReference};
188+
use datafusion_common::{Column, Spans, TableReference};
189189
use datafusion_expr::{BinaryExpr, Expr, Operator, and, col, lit};
190190
use vortex_array::arrays::{PrimitiveArray, StructArray, VarBinViewArray};
191191
use vortex_array::{Array, ArrayRef};
@@ -249,6 +249,7 @@ mod test {
249249
table: "orders".into(),
250250
}),
251251
name: "o_orderstatus".to_string(),
252+
spans: Spans::new(),
252253
}
253254
.into(),
254255
),

vortex-datafusion/src/persistent/config.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pub struct ConfigProjection {
3535
pub arrow_schema: SchemaRef,
3636
pub constraints: Constraints,
3737
pub statistics: Statistics,
38+
#[allow(dead_code)]
3839
pub orderings: Vec<LexOrdering>,
3940
pub projection_expr: Arc<dyn VortexExpr>,
4041
}

0 commit comments

Comments
 (0)