Skip to content

Commit

Permalink
chore: adopt new datafusion crate
Browse files Browse the repository at this point in the history
Signed-off-by: R. Tyler Croy <[email protected]>
Signed-off-by: Rush <[email protected]>
  • Loading branch information
rtyler authored and Rush committed Jan 16, 2025
1 parent 596a571 commit 0ead1a0
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ object_store = { version = "0.11" }
parquet = { version = "53" }

# datafusion
datafusion = { version = "41" }
datafusion-expr = { version = "41" }
datafusion-common = { version = "41" }
datafusion-proto = { version = "41" }
datafusion-sql = { version = "41" }
datafusion-physical-expr = { version = "41" }
datafusion-physical-plan = { version = "41" }
datafusion-functions = { version = "41" }
datafusion-functions-aggregate = { version = "41" }
datafusion = { version = "42" }
datafusion-expr = { version = "42" }
datafusion-common = { version = "42" }
datafusion-proto = { version = "42" }
datafusion-sql = { version = "42" }
datafusion-physical-expr = { version = "42" }
datafusion-physical-plan = { version = "42" }
datafusion-functions = { version = "42" }
datafusion-functions-aggregate = { version = "42" }

# serde
serde = { version = "1.0.194", features = ["derive"] }
Expand Down
5 changes: 3 additions & 2 deletions crates/core/src/delta_datafusion/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
//! ```
use std::any::Any;
use std::borrow::Cow;
use std::collections::{HashMap, HashSet};
use std::fmt::{self, Debug};
use std::sync::Arc;
Expand Down Expand Up @@ -707,7 +708,7 @@ impl TableProvider for DeltaTable {
None
}

fn get_logical_plan(&self) -> Option<&LogicalPlan> {
fn get_logical_plan(&self) -> Option<Cow<'_, LogicalPlan>> {
None
}

Expand Down Expand Up @@ -796,7 +797,7 @@ impl TableProvider for DeltaTableProvider {
None
}

fn get_logical_plan(&self) -> Option<&LogicalPlan> {
fn get_logical_plan(&self) -> Option<Cow<'_, LogicalPlan>> {
None
}

Expand Down
3 changes: 2 additions & 1 deletion crates/core/src/kernel/scalars.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//! Auxiliary methods for dealing with kernel scalars
use std::{cmp::Ordering, fmt::Debug};
use std::cmp::Ordering;

use arrow_array::Array;
use arrow_schema::TimeUnit;
Expand Down Expand Up @@ -270,6 +270,7 @@ impl ScalarExt for Scalar {
Self::Binary(val) => Value::String(create_escaped_binary_string(val.as_slice())),
Self::Null(_) => Value::Null,
Self::Struct(_) => unimplemented!(),
Self::Array(_) => unimplemented!(),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/writer/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ mod tests {
Some($value),
Some($value),
None,
0,
Some(0),
false,
))
};
Expand Down
1 change: 1 addition & 0 deletions crates/core/tests/command_merge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ async fn test_merge_different_range() {
let (_table_ref1, _metrics) = merge(table_ref1, df1, expr.clone()).await.unwrap();
let result = merge(table_ref2, df2, expr).await;

println!("{result:#?}");
assert!(result.is_ok());
}

Expand Down
2 changes: 1 addition & 1 deletion crates/hdfs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rust-version.workspace = true

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

# workspace dependecies
object_store = { workspace = true }
Expand Down

0 comments on commit 0ead1a0

Please sign in to comment.