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: Allow duration multiplied w/ primitive to propagate in IR schema #21394

Merged
merged 1 commit into from
Feb 22, 2025
Merged

fix: Allow duration multiplied w/ primitive to propagate in IR schema #21394

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
8 changes: 8 additions & 0 deletions crates/polars-plan/src/plans/aexpr/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,14 @@ fn get_arithmetic_field(
polars_bail!(InvalidOperation: "{} not allowed on {} and {}", op, left_field.dtype, right_type)
},
},
(Duration(_), r) if r.is_primitive_numeric() => match op {
Operator::Multiply => {
return Ok(left_field);
},
_ => {
polars_bail!(InvalidOperation: "{} not allowed on {} and {}", op, left_field.dtype, right_type)
},
},
#[cfg(feature = "dtype-decimal")]
(Decimal(_, Some(scale_left)), Decimal(_, Some(scale_right))) => {
let scale = match op {
Expand Down
26 changes: 24 additions & 2 deletions py-polars/tests/unit/operations/arithmetic/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,8 +705,8 @@ def test_arithmetic_duration_div_multiply() -> None:
("a", pl.Duration(time_unit="us")),
("b", pl.Duration(time_unit="us")),
("c", pl.Duration(time_unit="us")),
("d", pl.Unknown()),
("e", pl.Unknown()),
("d", pl.Duration(time_unit="us")),
("e", pl.Duration(time_unit="us")),
("f", pl.Float64()),
]
)
Expand Down Expand Up @@ -824,3 +824,25 @@ def test_raise_invalid_shape() -> None:
def test_integer_divide_scalar_zero_lhs_19142() -> None:
assert_series_equal(pl.Series([0]) // pl.Series([1, 0]), pl.Series([0, None]))
assert_series_equal(pl.Series([0]) % pl.Series([1, 0]), pl.Series([0, None]))


def test_compound_duration_21389() -> None:
# test add
lf = pl.LazyFrame(
{
"ts": datetime(2024, 1, 1, 1, 2, 3),
"duration": timedelta(days=1),
}
)
result = lf.select(pl.col("ts") + pl.col("duration") * 2)
expected_schema = pl.Schema({"ts": pl.Datetime(time_unit="us", time_zone=None)})
expected = pl.DataFrame({"ts": datetime(2024, 1, 3, 1, 2, 3)})
assert result.collect_schema() == expected_schema
assert_frame_equal(result.collect(), expected)

# test subtract
result = lf.select(pl.col("ts") - pl.col("duration") * 2)
expected_schema = pl.Schema({"ts": pl.Datetime(time_unit="us", time_zone=None)})
expected = pl.DataFrame({"ts": datetime(2023, 12, 30, 1, 2, 3)})
assert result.collect_schema() == expected_schema
assert_frame_equal(result.collect(), expected)
Loading