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

Jump to bottom

fix(rust, python): correct output dtype for cummin/cumsum/cummax #6062

Merged
merged 1 commit into from
Jan 5, 2023
Merged

fix(rust, python): correct output dtype for cummin/cumsum/cummax #6062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions polars/polars-lazy/polars-plan/src/dsl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,14 +880,18 @@ impl Expr {
move |s: Series| Ok(s.cumsum(reverse)),
GetOutput::map_dtype(|dt| {
use DataType::*;
match dt {
Boolean => UInt32,
Int32 => Int32,
UInt32 => UInt32,
UInt64 => UInt64,
Float32 => Float32,
Float64 => Float64,
_ => Int64,
if dt.is_logical() {
dt.clone()
} else {
match dt {
Boolean => UInt32,
Int32 => Int32,
UInt32 => UInt32,
UInt64 => UInt64,
Float32 => Float32,
Float64 => Float64,
_ => Int64,
}
}
}),
)
Expand Down Expand Up @@ -928,14 +932,7 @@ impl Expr {
pub fn cummax(self, reverse: bool) -> Self {
self.apply(
move |s: Series| Ok(s.cummax(reverse)),
GetOutput::map_dtype(|dt| {
use DataType::*;
match dt {
Float32 => Float32,
Float64 => Float64,
_ => Int64,
}
}),
GetOutput::same_type(),
)
.with_fmt("cummax")
}
Expand Down
55 changes: 55 additions & 0 deletions py-polars/tests/unit/test_datelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2337,3 +2337,58 @@ def test_tz_aware_day_weekday() -> None:
"tyo_weekday": [1, 4, 7],
"ny_weekday": [7, 3, 6],
}


def test_datetime_cum_agg_schema() -> None:
df = pl.DataFrame(
{
"timestamp": [
datetime(2023, 1, 1),
datetime(2023, 1, 2),
datetime(2023, 1, 3),
]
}
)
# Exactly the same as above but with lazy() and collect() later
assert (
df.lazy()
.with_columns(
[
(pl.col("timestamp").cummin()).alias("cummin"),
(pl.col("timestamp").cummax()).alias("cummax"),
]
)
.with_columns(
[
(pl.col("cummin") + pl.duration(hours=24)).alias("cummin+24"),
(pl.col("cummax") + pl.duration(hours=24)).alias("cummax+24"),
]
)
.collect()
).to_dict(False) == {
"timestamp": [
datetime(2023, 1, 1, 0, 0),
datetime(2023, 1, 2, 0, 0),
datetime(2023, 1, 3, 0, 0),
],
"cummin": [
datetime(2023, 1, 1, 0, 0),
datetime(2023, 1, 1, 0, 0),
datetime(2023, 1, 1, 0, 0),
],
"cummax": [
datetime(2023, 1, 1, 0, 0),
datetime(2023, 1, 2, 0, 0),
datetime(2023, 1, 3, 0, 0),
],
"cummin+24": [
datetime(2023, 1, 2, 0, 0),
datetime(2023, 1, 2, 0, 0),
datetime(2023, 1, 2, 0, 0),
],
"cummax+24": [
datetime(2023, 1, 2, 0, 0),
datetime(2023, 1, 3, 0, 0),
datetime(2023, 1, 4, 0, 0),
],
}