Python: Fix date/time transforms #5667
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rdblue
commented
Aug 29, 2022
| def micros_to_years(timestamp: int) -> int: | ||
| dt = micros_to_timestamp(timestamp) | ||
| return (dt.year - EPOCH_TIMESTAMP.year) - ( | ||
| 1 if dt.month < EPOCH_TIMESTAMP.month or (dt.month == EPOCH_TIMESTAMP.month and dt.day < EPOCH_TIMESTAMP.day) else 0 |
Contributor
Author
There was a problem hiding this comment.
Month and day are never 0.
rdblue
commented
Aug 29, 2022
| return int((datetime.utcfromtimestamp(timestamp // 1_000_000) - EPOCH_TIMESTAMP).total_seconds() / 3600) | ||
| def micros_to_hours(micros: int) -> int: | ||
| """Converts a timestamp in microseconds to hours from 1970-01-01T00:00""" | ||
| return micros // 3_600_000_000 |
Contributor
Author
There was a problem hiding this comment.
This converts to a timestamp only to get back to a delta, and then get the seconds. Instead, we can convert directly.
rdblue
commented
Aug 29, 2022
| def micros_to_days(timestamp: int) -> int: | ||
| """Converts a timestamp in microseconds to a date in days""" | ||
| return (datetime.fromtimestamp(timestamp / 1_000_000) - EPOCH_TIMESTAMP).days | ||
| return timedelta(microseconds=timestamp).days |
Contributor
Author
There was a problem hiding this comment.
Here, we can go directly to delta rather than going to date and subtracting.
Fokko
approved these changes
Aug 29, 2022
Contributor
Fokko
left a comment
Fokko
left a comment
There was a problem hiding this comment.
Looks good to me, thanks @rdblue
Also, this is already properly tested:
poetry run coverage report -m --fail-under=90
Name Stmts Miss Cover Missing
------------------------------------------------------------------------
...
pyiceberg/utils/datetime.py 69 0 100%
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes some of the date/time transform methods introduced in #5462.