Skip to content

Commit 0c57e59

Browse files
chore: remove explicit aliases from functions.rs
Ref: apache#779
1 parent a75861d commit 0c57e59

File tree

2 files changed

+1
-60
lines changed

2 files changed

+1
-60
lines changed

python/datafusion/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ def covar(y: Expr, x: Expr) -> Expr:
13071307
13081308
This is an alias for `covar_samp`.
13091309
"""
1310-
return Expr(f.covar(y.expr, x.expr))
1310+
return Expr(f.covar_samp(y.expr, x.expr))
13111311

13121312

13131313
def covar_pop(y: Expr, x: Expr) -> Expr:

src/functions.rs

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ pub fn bool_or(expression: PyExpr, distinct: bool) -> PyResult<PyExpr> {
146146
}
147147
}
148148

149-
#[pyfunction]
150-
pub fn mean(expression: PyExpr, distinct: bool) -> PyResult<PyExpr> {
151-
// alias for avg
152-
avg(expression, distinct)
153-
}
154-
155149
#[pyfunction]
156150
pub fn corr(y: PyExpr, x: PyExpr, distinct: bool) -> PyResult<PyExpr> {
157151
let expr = functions_aggregate::expr_fn::corr(y.expr, x.expr);
@@ -192,11 +186,6 @@ pub fn median(arg: PyExpr) -> PyExpr {
192186
functions_aggregate::expr_fn::median(arg.expr).into()
193187
}
194188

195-
#[pyfunction]
196-
pub fn covar(y: PyExpr, x: PyExpr) -> PyExpr {
197-
// alias for covar_samp
198-
covar_samp(y, x)
199-
}
200189

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

226-
#[pyfunction]
227-
/// Alias for [`var_samp`]
228-
pub fn var(y: PyExpr) -> PyExpr {
229-
var_samp(y)
230-
}
231215

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

414-
#[pyfunction]
415-
#[pyo3(signature = (*exprs))]
416-
fn array(exprs: Vec<PyExpr>) -> PyExpr {
417-
// alias for make_array
418-
make_array(exprs)
419-
}
420-
421398
#[pyfunction]
422399
#[pyo3(signature = (*exprs))]
423400
fn array_concat(exprs: Vec<PyExpr>) -> PyExpr {
@@ -439,27 +416,6 @@ fn array_position(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr
439416
datafusion_functions_array::expr_fn::array_position(array.into(), element.into(), index).into()
440417
}
441418

442-
#[pyfunction]
443-
#[pyo3(signature = (array, element, index = 1))]
444-
fn array_indexof(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
445-
// alias of array_position
446-
array_position(array, element, index)
447-
}
448-
449-
#[pyfunction]
450-
#[pyo3(signature = (array, element, index = 1))]
451-
fn list_position(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
452-
// alias of array_position
453-
array_position(array, element, index)
454-
}
455-
456-
#[pyfunction]
457-
#[pyo3(signature = (array, element, index = 1))]
458-
fn list_indexof(array: PyExpr, element: PyExpr, index: Option<i64>) -> PyExpr {
459-
// alias of array_position
460-
array_position(array, element, index)
461-
}
462-
463419
#[pyfunction]
464420
#[pyo3(signature = (array, begin, end, stride = None))]
465421
fn array_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<PyExpr>) -> PyExpr {
@@ -472,13 +428,6 @@ fn array_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<PyExpr>
472428
.into()
473429
}
474430

475-
#[pyfunction]
476-
#[pyo3(signature = (array, begin, end, stride = None))]
477-
fn list_slice(array: PyExpr, begin: PyExpr, end: PyExpr, stride: Option<PyExpr>) -> PyExpr {
478-
// alias of array_slice
479-
array_slice(array, begin, end, stride)
480-
}
481-
482431
/// Computes a binary hash of the given data. type is the algorithm to use.
483432
/// Standard algorithms are md5, sha224, sha256, sha384, sha512, blake2s, blake2b, and blake3.
484433
// #[pyfunction(value, method)]
@@ -999,7 +948,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
999948
m.add_wrapped(wrap_pyfunction!(approx_median))?;
1000949
m.add_wrapped(wrap_pyfunction!(approx_percentile_cont))?;
1001950
m.add_wrapped(wrap_pyfunction!(approx_percentile_cont_with_weight))?;
1002-
m.add_wrapped(wrap_pyfunction!(array))?;
1003951
m.add_wrapped(wrap_pyfunction!(range))?;
1004952
m.add_wrapped(wrap_pyfunction!(array_agg))?;
1005953
m.add_wrapped(wrap_pyfunction!(arrow_typeof))?;
@@ -1028,7 +976,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
1028976
m.add_wrapped(wrap_pyfunction!(cot))?;
1029977
m.add_wrapped(wrap_pyfunction!(count))?;
1030978
m.add_wrapped(wrap_pyfunction!(count_star))?;
1031-
m.add_wrapped(wrap_pyfunction!(covar))?;
1032979
m.add_wrapped(wrap_pyfunction!(covar_pop))?;
1033980
m.add_wrapped(wrap_pyfunction!(covar_samp))?;
1034981
m.add_wrapped(wrap_pyfunction!(current_date))?;
@@ -1066,7 +1013,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
10661013
m.add_wrapped(wrap_pyfunction!(max))?;
10671014
m.add_wrapped(wrap_pyfunction!(make_array))?;
10681015
m.add_wrapped(wrap_pyfunction!(md5))?;
1069-
m.add_wrapped(wrap_pyfunction!(mean))?;
10701016
m.add_wrapped(wrap_pyfunction!(median))?;
10711017
m.add_wrapped(wrap_pyfunction!(min))?;
10721018
m.add_wrapped(wrap_pyfunction!(named_struct))?;
@@ -1123,7 +1069,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
11231069
m.add_wrapped(wrap_pyfunction!(trunc))?;
11241070
m.add_wrapped(wrap_pyfunction!(upper))?;
11251071
m.add_wrapped(wrap_pyfunction!(self::uuid))?; // Use self to avoid name collision
1126-
m.add_wrapped(wrap_pyfunction!(var))?;
11271072
m.add_wrapped(wrap_pyfunction!(var_pop))?;
11281073
m.add_wrapped(wrap_pyfunction!(var_samp))?;
11291074
m.add_wrapped(wrap_pyfunction!(window))?;
@@ -1169,9 +1114,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
11691114
m.add_wrapped(wrap_pyfunction!(array_has_all))?;
11701115
m.add_wrapped(wrap_pyfunction!(array_has_any))?;
11711116
m.add_wrapped(wrap_pyfunction!(array_position))?;
1172-
m.add_wrapped(wrap_pyfunction!(array_indexof))?;
1173-
m.add_wrapped(wrap_pyfunction!(list_position))?;
1174-
m.add_wrapped(wrap_pyfunction!(list_indexof))?;
11751117
m.add_wrapped(wrap_pyfunction!(array_positions))?;
11761118
m.add_wrapped(wrap_pyfunction!(list_positions))?;
11771119
m.add_wrapped(wrap_pyfunction!(array_to_string))?;
@@ -1210,7 +1152,6 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
12101152
m.add_wrapped(wrap_pyfunction!(array_sort))?;
12111153
m.add_wrapped(wrap_pyfunction!(list_sort))?;
12121154
m.add_wrapped(wrap_pyfunction!(array_slice))?;
1213-
m.add_wrapped(wrap_pyfunction!(list_slice))?;
12141155
m.add_wrapped(wrap_pyfunction!(flatten))?;
12151156

12161157
Ok(())

0 commit comments

Comments
 (0)