Skip to content

[Bug Fix] all TimeTransforms for falsey values #280

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

Merged
HonahX merged 2 commits into from
Jan 19, 2024
Merged

[Bug Fix] all TimeTransforms for falsey values #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0232b41
fix all falsey transforms
sungwy Jan 18, 2024
b9cd058
Merge branch 'apache:main' into falsey-transforms
sungwy Jan 18, 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
6 changes: 3 additions & 3 deletions pyiceberg/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def month_func(v: Any) -> int:
else:
raise ValueError(f"Cannot apply month transform for type: {source}")

return lambda v: month_func(v) if v else None
return lambda v: month_func(v) if v is not None else None

def can_transform(self, source: IcebergType) -> bool:
return isinstance(source, (DateType, TimestampType, TimestamptzType))
Expand Down Expand Up @@ -424,7 +424,7 @@ def day_func(v: Any) -> int:
else:
raise ValueError(f"Cannot apply day transform for type: {source}")

return lambda v: day_func(v) if v else None
return lambda v: day_func(v) if v is not None else None

def can_transform(self, source: IcebergType) -> bool:
return isinstance(source, (DateType, TimestampType, TimestamptzType))
Expand Down Expand Up @@ -464,7 +464,7 @@ def hour_func(v: Any) -> int:
else:
raise ValueError(f"Cannot apply hour transform for type: {source}")

return lambda v: hour_func(v) if v else None
return lambda v: hour_func(v) if v is not None else None

def can_transform(self, source: IcebergType) -> bool:
return isinstance(source, (TimestampType, TimestamptzType))
Expand Down
20 changes: 20 additions & 0 deletions tests/test_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,19 @@ def test_negative_value_to_human_string(negative_value: int, time_transform: Tim
assert time_transform.to_human_string(TimestampType(), negative_value) == expected


@pytest.mark.parametrize(
"zero_value,time_transform,expected",
[
(0, YearTransform(), "1970"),
(0, MonthTransform(), "1970-01"),
(0, DayTransform(), "1970-01-01"),
(0, HourTransform(), "1970-01-01-00"),
],
)
def test_zero_value_to_human_string(zero_value: int, time_transform: TimeTransform[Any], expected: str) -> None:
assert time_transform.to_human_string(TimestampType(), zero_value) == expected


@pytest.mark.parametrize(
"type_var",
[
Expand Down Expand Up @@ -274,6 +287,12 @@ def test_time_methods(type_var: PrimitiveType) -> None:
(MonthTransform(), TimestamptzType(), -1, -1),
(DayTransform(), TimestampType(), 1512151975038194, 17501),
(DayTransform(), TimestampType(), -1, -1),
(YearTransform(), DateType(), 0, 0),
(MonthTransform(), DateType(), 0, 0),
(DayTransform(), DateType(), 0, 0),
(YearTransform(), TimestampType(), 0, 0),
(MonthTransform(), TimestampType(), 0, 0),
(DayTransform(), TimestampType(), 0, 0),
],
)
def test_time_apply_method(transform: TimeTransform[Any], type_var: PrimitiveType, value: int, expected: int) -> None:
Expand All @@ -291,6 +310,7 @@ def test_hour_method(type_var: PrimitiveType) -> None:
assert HourTransform().can_transform(type_var)
assert HourTransform().result_type(type_var) == IntegerType()
assert HourTransform().transform(type_var)(1512151975038194) == 420042 # type: ignore
assert HourTransform().transform(type_var)(0) == 0 # type: ignore
assert HourTransform().dedup_name == "time"


Expand Down