Skip to content

[4.4] Improve performance of from_ordinal of temporal types. #1047

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
merged 1 commit into from
Apr 24, 2024
Merged

[4.4] Improve performance of from_ordinal of temporal types. #1047

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
47 changes: 7 additions & 40 deletions neo4j/time/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,35 +900,10 @@ def from_ordinal(cls, ordinal):
"""
if ordinal == 0:
return ZeroDate
if ordinal >= 736695:
year = 2018 # Project release year
month = 1
day = int(ordinal - 736694)
elif ordinal >= 719163:
year = 1970 # Unix epoch
month = 1
day = int(ordinal - 719162)
else:
year = 1
month = 1
day = int(ordinal)
if day < 1 or day > 3652059:
# Note: this requires a maximum of 22 bits for storage
# Could be transferred in 3 bytes.
raise ValueError("Ordinal out of range (1..3652059)")
if year < MIN_YEAR or year > MAX_YEAR:
raise ValueError("Year out of range (%d..%d)" % (MIN_YEAR, MAX_YEAR))
days_in_year = DAYS_IN_YEAR[year]
while day > days_in_year:
day -= days_in_year
year += 1
days_in_year = DAYS_IN_YEAR[year]
days_in_month = DAYS_IN_MONTH[(year, month)]
while day > days_in_month:
day -= days_in_month
month += 1
days_in_month = DAYS_IN_MONTH[(year, month)]
year, month, day = _normalize_day(year, month, day)
elif ordinal < 0 or ordinal > 3652059:
raise ValueError("Ordinal out of range (0..3652059)")
d = datetime.fromordinal(ordinal)
year, month, day = _normalize_day(d.year, d.month, d.day)
return cls.__new(ordinal, year, month, day)

@classmethod
Expand Down Expand Up @@ -1218,17 +1193,9 @@ def __add__(self, other):
:raises ValueError: if the added duration has a time component.
"""
def add_months(d, months):
years, months = symmetric_divmod(months, 12)
year = d.__year + years
month = d.__month + months
while month > 12:
year += 1
month -= 12
while month < 1:
year -= 1
month += 12
d.__year = year
d.__month = month
overflow_years, month = divmod(months + d.__month - 1, 12)
d.__year += overflow_years
d.__month = month + 1

def add_days(d, days):
assert 1 <= d.__day <= 28 or -28 <= d.__day <= -1
Expand Down