Skip to content

Commit 0ead1a0

Browse files
rtylerRush
authored andcommitted
chore: adopt new datafusion crate
Signed-off-by: R. Tyler Croy <[email protected]> Signed-off-by: Rush <[email protected]>
1 parent 596a571 commit 0ead1a0

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ object_store = { version = "0.11" }
4545
parquet = { version = "53" }
4646

4747
# datafusion
48-
datafusion = { version = "41" }
49-
datafusion-expr = { version = "41" }
50-
datafusion-common = { version = "41" }
51-
datafusion-proto = { version = "41" }
52-
datafusion-sql = { version = "41" }
53-
datafusion-physical-expr = { version = "41" }
54-
datafusion-physical-plan = { version = "41" }
55-
datafusion-functions = { version = "41" }
56-
datafusion-functions-aggregate = { version = "41" }
48+
datafusion = { version = "42" }
49+
datafusion-expr = { version = "42" }
50+
datafusion-common = { version = "42" }
51+
datafusion-proto = { version = "42" }
52+
datafusion-sql = { version = "42" }
53+
datafusion-physical-expr = { version = "42" }
54+
datafusion-physical-plan = { version = "42" }
55+
datafusion-functions = { version = "42" }
56+
datafusion-functions-aggregate = { version = "42" }
5757

5858
# serde
5959
serde = { version = "1.0.194", features = ["derive"] }

crates/core/src/delta_datafusion/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
//! ```
2222
2323
use std::any::Any;
24+
use std::borrow::Cow;
2425
use std::collections::{HashMap, HashSet};
2526
use std::fmt::{self, Debug};
2627
use std::sync::Arc;
@@ -707,7 +708,7 @@ impl TableProvider for DeltaTable {
707708
None
708709
}
709710

710-
fn get_logical_plan(&self) -> Option<&LogicalPlan> {
711+
fn get_logical_plan(&self) -> Option<Cow<'_, LogicalPlan>> {
711712
None
712713
}
713714

@@ -796,7 +797,7 @@ impl TableProvider for DeltaTableProvider {
796797
None
797798
}
798799

799-
fn get_logical_plan(&self) -> Option<&LogicalPlan> {
800+
fn get_logical_plan(&self) -> Option<Cow<'_, LogicalPlan>> {
800801
None
801802
}
802803

crates/core/src/kernel/scalars.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! Auxiliary methods for dealing with kernel scalars
2-
use std::{cmp::Ordering, fmt::Debug};
2+
use std::cmp::Ordering;
33

44
use arrow_array::Array;
55
use arrow_schema::TimeUnit;
@@ -270,6 +270,7 @@ impl ScalarExt for Scalar {
270270
Self::Binary(val) => Value::String(create_escaped_binary_string(val.as_slice())),
271271
Self::Null(_) => Value::Null,
272272
Self::Struct(_) => unimplemented!(),
273+
Self::Array(_) => unimplemented!(),
273274
}
274275
}
275276
}

crates/core/src/writer/stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ mod tests {
613613
Some($value),
614614
Some($value),
615615
None,
616-
0,
616+
Some(0),
617617
false,
618618
))
619619
};

crates/core/tests/command_merge.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ async fn test_merge_different_range() {
173173
let (_table_ref1, _metrics) = merge(table_ref1, df1, expr.clone()).await.unwrap();
174174
let result = merge(table_ref2, df2, expr).await;
175175

176+
println!("{result:#?}");
176177
assert!(result.is_ok());
177178
}
178179

crates/hdfs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rust-version.workspace = true
1313

1414
[dependencies]
1515
deltalake-core = { version = "0.21.0", path = "../core" }
16-
hdfs-native-object-store = "0.11"
16+
hdfs-native-object-store = "0.12"
1717

1818
# workspace dependecies
1919
object_store = { workspace = true }

0 commit comments

Comments
 (0)