Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions datafusion/tests/test_aggregation.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ def df():
pa.array([1, 2, 3]),
pa.array([4, 4, 6]),
pa.array([9, 8, 5]),
pa.array([True, True, False]),
],
names=["a", "b", "c"],
names=["a", "b", "c", "d"],
)
return ctx.create_dataframe([[batch]])

Expand Down Expand Up @@ -73,7 +74,7 @@ def test_built_in_aggregation(df):
],
)
result = agg_df.collect()[0]
values_a, values_b, values_c = df.collect()[0]
values_a, values_b, values_c, values_d = df.collect()[0]

assert result.column(0) == pa.array([2], type=pa.uint64())
assert result.column(1) == pa.array([4])
Expand Down Expand Up @@ -125,3 +126,36 @@ def test_built_in_aggregation(df):
np.testing.assert_array_almost_equal(
result.column(21), np.var(values_c, ddof=1)
)


def test_bit_add_or_xor(df):

df = df.aggregate(
[],
[
f.bit_and(column("a")),
f.bit_or(column("b")),
f.bit_xor(column("c")),
],
)

result = df.collect()
result = result[0]
assert result.column(0) == pa.array([0])
assert result.column(1) == pa.array([6])
assert result.column(2) == pa.array([4])


def test_bool_and_or(df):

df = df.aggregate(
[],
[
f.bool_and(column("d")),
f.bool_or(column("d")),
],
)
result = df.collect()
result = result[0]
assert result.column(0) == pa.array([False])
assert result.column(1) == pa.array([True])
10 changes: 10 additions & 0 deletions src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,11 @@ aggregate_function!(stddev_samp, Stddev);
aggregate_function!(var, Variance);
aggregate_function!(var_pop, VariancePop);
aggregate_function!(var_samp, Variance);
aggregate_function!(bit_and, BitAnd);
aggregate_function!(bit_or, BitOr);
aggregate_function!(bit_xor, BitXor);
aggregate_function!(bool_and, BoolAnd);
aggregate_function!(bool_or, BoolOr);

pub(crate) fn init_module(m: &PyModule) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(abs))?;
Expand Down Expand Up @@ -489,6 +494,11 @@ pub(crate) fn init_module(m: &PyModule) -> PyResult<()> {
m.add_wrapped(wrap_pyfunction!(var_pop))?;
m.add_wrapped(wrap_pyfunction!(var_samp))?;
m.add_wrapped(wrap_pyfunction!(window))?;
m.add_wrapped(wrap_pyfunction!(bit_and))?;
m.add_wrapped(wrap_pyfunction!(bit_or))?;
m.add_wrapped(wrap_pyfunction!(bit_xor))?;
m.add_wrapped(wrap_pyfunction!(bool_and))?;
m.add_wrapped(wrap_pyfunction!(bool_or))?;

//Binary String Functions
m.add_wrapped(wrap_pyfunction!(encode))?;
Expand Down