Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix elementwise-apply if any input is AggregatedScalar #15606

Merged
merged 4 commits into from
Apr 12, 2024
Merged

fix: Fix elementwise-apply if any input is AggregatedScalar #15606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4085dd5
fix: Fix elementwise-apply if any input is `AggregatedScalar`
reswqa Apr 12, 2024
d59c930
propagate scalar
reswqa Apr 12, 2024
8a71cbb
Some refactor
reswqa Apr 12, 2024
df668e7
fix
reswqa Apr 12, 2024
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
18 changes: 13 additions & 5 deletions crates/polars-lazy/src/physical_plan/expressions/apply.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,11 +354,19 @@ impl PhysicalExpr for ApplyExpr {
},
ApplyOptions::GroupWise => self.apply_multiple_group_aware(acs, df),
ApplyOptions::ElementWise => {
if acs
.iter()
.any(|ac| matches!(ac.agg_state(), AggState::AggregatedList(_)))
{
self.apply_multiple_group_aware(acs, df)
let mut has_agg_list = false;
let mut has_agg_scalar = false;
let mut has_not_agg = false;
for ac in &acs {
match ac.state {
AggState::AggregatedList(_) => has_agg_list = true,
AggState::AggregatedScalar(_) => has_agg_scalar = true,
AggState::NotAggregated(_) => has_not_agg = true,
_ => {},
}
}
if has_agg_list || (has_agg_scalar && has_not_agg) {
return self.apply_multiple_group_aware(acs, df);
} else {
apply_multiple_elementwise(
acs,
Expand Down
10 changes: 10 additions & 0 deletions py-polars/tests/unit/operations/test_group_by.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,3 +975,13 @@ def test_partitioned_group_by_14954(monkeypatch: Any) -> None:
[False, False, False, False, False, False, False, False, False, False],
],
}


def test_aggregated_scalar_elementwise_15602() -> None:
df = pl.DataFrame({"group": [1, 2, 1]})

out = df.group_by("group", maintain_order=True).agg(
foo=pl.col("group").is_between(1, pl.max("group"))
)
expected = pl.DataFrame({"group": [1, 2], "foo": [[True, True], [True]]})
assert_frame_equal(out, expected)
Loading