Skip to content

Commit

Permalink
chore: remove explicit aliases from functions.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael-J-Ward committed Jul 26, 2024
1 parent a75861d commit 0c57e59
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 60 deletions.
2 changes: 1 addition & 1 deletion python/datafusion/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ def covar(y: Expr, x: Expr) -> Expr:
This is an alias for `covar_samp`.
"""
return Expr(f.covar(y.expr, x.expr))
return Expr(f.covar_samp(y.expr, x.expr))


def covar_pop(y: Expr, x: Expr) -> Expr:
Expand Down
59 changes: 0 additions & 59 deletions src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,6 @@ pub fn bool_or(expression: PyExpr, distinct: bool) -> PyResult<PyExpr> {
}
}

#[pyfunction]
pub fn mean(expression: PyExpr, distinct: bool) -> PyResult<PyExpr> {
// alias for avg
avg(expression, distinct)
}

#[pyfunction]
pub fn corr(y: PyExpr, x: PyExpr, distinct: bool) -> PyResult<PyExpr> {
let expr = functions_aggregate::expr_fn::corr(y.expr, x.expr);
Expand Down Expand Up @@ -192,11 +186,6 @@ pub fn median(arg: PyExpr) -> PyExpr {
functions_aggregate::expr_fn::median(arg.expr).into()
}

#[pyfunction]
pub fn covar(y: PyExpr, x: PyExpr) -> PyExpr {
// alias for covar_samp
covar_samp(y, x)
}

#[pyfunction]
pub fn stddev(expression: PyExpr, distinct: bool) -> PyResult<PyExpr> {
Expand All @@ -223,11 +212,6 @@ pub fn var_samp(expression: PyExpr) -> PyExpr {
functions_aggregate::expr_fn::var_sample(expression.expr).into()
}

#[pyfunction]
/// Alias for [`var_samp`]
pub fn var(y: PyExpr) -> PyExpr {
var_samp(y)
}

#[pyfunction]
pub fn var_pop(expression: PyExpr, distinct: bool) -> PyResult<PyExpr> {
Expand Down Expand Up @@ -411,13 +395,6 @@ fn make_array(exprs: Vec<PyExpr>) -> PyExpr {
.into()
}

#[pyfunction]
#[pyo3(signature = (*exprs))]
fn array(exprs: Vec<PyExpr>) -> PyExpr {
// alias for make_array
make_array(exprs)
}

#[pyfunction]
#[pyo3(signature = (*exprs))]
fn array_concat(exprs: Vec<PyExpr>) -> PyExpr {
Expand All @@ -439,27 +416,6 @@ fn array_position(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr
datafusion_functions_array::expr_fn::array_position(array.into(), element.into(), index).into()
}

#[pyfunction]
#[pyo3(signature = (array, element, index = 1))]
fn array_indexof(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
// alias of array_position
array_position(array, element, index)
}

#[pyfunction]
#[pyo3(signature = (array, element, index = 1))]
fn list_position(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
// alias of array_position
array_position(array, element, index)
}

#[pyfunction]
#[pyo3(signature = (array, element, index = 1))]
fn list_indexof(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
// alias of array_position
array_position(array, element, index)
}

#[pyfunction]
#[pyo3(signature = (array, begin, end, stride = None))]
fn array_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<PyExpr>) -> PyExpr {
Expand All @@ -472,13 +428,6 @@ fn array_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<PyExpr>
.into()
}

#[pyfunction]
#[pyo3(signature = (array, begin, end, stride = None))]
fn list_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<PyExpr>) -> PyExpr {
// alias of array_slice
array_slice(array, begin, end, stride)
}

/// Computes a binary hash of the given data. type is the algorithm to use.
/// Standard algorithms are md5, sha224, sha256, sha384, sha512, blake2s, blake2b, and blake3.
// #[pyfunction(value, method)]
Expand Down Expand Up @@ -999,7 +948,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(approx_median))?;
m.add_wrapped(wrap_pyfunction!(approx_percentile_cont))?;
m.add_wrapped(wrap_pyfunction!(approx_percentile_cont_with_weight))?;
m.add_wrapped(wrap_pyfunction!(array))?;
m.add_wrapped(wrap_pyfunction!(range))?;
m.add_wrapped(wrap_pyfunction!(array_agg))?;
m.add_wrapped(wrap_pyfunction!(arrow_typeof))?;
Expand Down Expand Up @@ -1028,7 +976,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(cot))?;
m.add_wrapped(wrap_pyfunction!(count))?;
m.add_wrapped(wrap_pyfunction!(count_star))?;
m.add_wrapped(wrap_pyfunction!(covar))?;
m.add_wrapped(wrap_pyfunction!(covar_pop))?;
m.add_wrapped(wrap_pyfunction!(covar_samp))?;
m.add_wrapped(wrap_pyfunction!(current_date))?;
Expand Down Expand Up @@ -1066,7 +1013,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(max))?;
m.add_wrapped(wrap_pyfunction!(make_array))?;
m.add_wrapped(wrap_pyfunction!(md5))?;
m.add_wrapped(wrap_pyfunction!(mean))?;
m.add_wrapped(wrap_pyfunction!(median))?;
m.add_wrapped(wrap_pyfunction!(min))?;
m.add_wrapped(wrap_pyfunction!(named_struct))?;
Expand Down Expand Up @@ -1123,7 +1069,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(trunc))?;
m.add_wrapped(wrap_pyfunction!(upper))?;
m.add_wrapped(wrap_pyfunction!(self::uuid))?; // Use self to avoid name collision
m.add_wrapped(wrap_pyfunction!(var))?;
m.add_wrapped(wrap_pyfunction!(var_pop))?;
m.add_wrapped(wrap_pyfunction!(var_samp))?;
m.add_wrapped(wrap_pyfunction!(window))?;
Expand Down Expand Up @@ -1169,9 +1114,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(array_has_all))?;
m.add_wrapped(wrap_pyfunction!(array_has_any))?;
m.add_wrapped(wrap_pyfunction!(array_position))?;
m.add_wrapped(wrap_pyfunction!(array_indexof))?;
m.add_wrapped(wrap_pyfunction!(list_position))?;
m.add_wrapped(wrap_pyfunction!(list_indexof))?;
m.add_wrapped(wrap_pyfunction!(array_positions))?;
m.add_wrapped(wrap_pyfunction!(list_positions))?;
m.add_wrapped(wrap_pyfunction!(array_to_string))?;
Expand Down Expand Up @@ -1210,7 +1152,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(array_sort))?;
m.add_wrapped(wrap_pyfunction!(list_sort))?;
m.add_wrapped(wrap_pyfunction!(array_slice))?;
m.add_wrapped(wrap_pyfunction!(list_slice))?;
m.add_wrapped(wrap_pyfunction!(flatten))?;

Ok(())
Expand Down

0 comments on commit 0c57e59

Please sign in to comment.