diff --git a/Cargo.toml b/Cargo.toml index d6f65edd..ae94fbd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,8 +41,10 @@ arrow = { version = "52", feature = ["pyarrow"] } datafusion = { git = "https://github.com/apache/datafusion.git", features = ["pyarrow", "avro", "unicode_expressions"] } datafusion-common = { git = "https://github.com/apache/datafusion.git", features = ["pyarrow"] } datafusion-expr = { git = "https://github.com/apache/datafusion.git" } -datafusion-functions-array = { git = "https://github.com/apache/datafusion.git", package = "datafusion-functions-nested" } +datafusion-functions-nested = { git = "https://github.com/apache/datafusion.git" } +# TODO: is this just re-exported? datafusion-optimizer = { git = "https://github.com/apache/datafusion.git" } +# TODO: is this just re-exported? datafusion-sql = { git = "https://github.com/apache/datafusion.git" } datafusion-substrait = { git = "https://github.com/apache/datafusion.git", optional = true } prost = "0.12" # keep in line with `datafusion-substrait` diff --git a/src/functions.rs b/src/functions.rs index 4db3a3ea..c53d4ad9 100644 --- a/src/functions.rs +++ b/src/functions.rs @@ -388,14 +388,14 @@ fn in_list(expr: PyExpr, value: Vec, negated: bool) -> PyExpr { #[pyfunction] fn make_array(exprs: Vec) -> PyExpr { - datafusion_functions_array::expr_fn::make_array(exprs.into_iter().map(|x| x.into()).collect()) + datafusion_functions_nested::expr_fn::make_array(exprs.into_iter().map(|x| x.into()).collect()) .into() } #[pyfunction] fn array_concat(exprs: Vec) -> PyExpr { let exprs = exprs.into_iter().map(|x| x.into()).collect(); - datafusion_functions_array::expr_fn::array_concat(exprs).into() + datafusion_functions_nested::expr_fn::array_concat(exprs).into() } #[pyfunction] @@ -407,12 +407,12 @@ fn array_cat(exprs: Vec) -> PyExpr { fn array_position(array: PyExpr, element: PyExpr, index: Option) -> PyExpr { let index = ScalarValue::Int64(index); let index = Expr::Literal(index); - datafusion_functions_array::expr_fn::array_position(array.into(), element.into(), index).into() + datafusion_functions_nested::expr_fn::array_position(array.into(), element.into(), index).into() } #[pyfunction] fn array_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option) -> PyExpr { - datafusion_functions_array::expr_fn::array_slice( + datafusion_functions_nested::expr_fn::array_slice( array.into(), begin.into(), end.into(), @@ -695,7 +695,7 @@ macro_rules! expr_fn_vec { }; } -/// Generates a [pyo3] wrapper for [datafusion_functions_array::expr_fn] +/// Generates a [pyo3] wrapper for [datafusion_functions_nested::expr_fn] /// /// These functions have explicit named arguments. macro_rules! array_fn { @@ -712,7 +712,7 @@ macro_rules! array_fn { #[doc = $DOC] #[pyfunction] fn $FUNC($($arg: PyExpr),*) -> PyExpr { - datafusion_functions_array::expr_fn::$FUNC($($arg.into()),*).into() + datafusion_functions_nested::expr_fn::$FUNC($($arg.into()),*).into() } }; }