Skip to content

[SPARK-22010][PySpark] Change fromInternal method of TimestampType #19234

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

Closed
wants to merge 6 commits into from
Closed

[SPARK-22010][PySpark] Change fromInternal method of TimestampType #19234

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
238b556
Change internal Timestamp conversion
maver1ck Sep 14, 2017
0cb2a48
Typo fix
maver1ck Sep 14, 2017
02301eb
Import fix
maver1ck Sep 14, 2017
25bf50d
PEP8 compliance
maver1ck Sep 14, 2017
f18f4c8
Change way to check if timezone equals UTC
maver1ck Sep 14, 2017
bed6193
Add support for leap seconds
maver1ck Sep 16, 2017
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: 7 additions & 1 deletion python/pyspark/sql/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ def fromInternal(self, v):
return datetime.date.fromordinal(v + self.EPOCH_ORDINAL)


_is_utc = time.tzname[time.daylight] == "UTC"


class TimestampType(AtomicType):
"""Timestamp (datetime.datetime) data type.
"""
Expand All @@ -196,7 +199,10 @@ def toInternal(self, dt):
def fromInternal(self, ts):
if ts is not None:
# using int to avoid precision loss in float
return datetime.datetime.fromtimestamp(ts // 1000000).replace(microsecond=ts % 1000000)
y, m, d, hh, mm, ss, _, _, _ = (time.gmtime(ts // 1000000) if _is_utc
else time.localtime(ts // 1000000))
ss = min(ss, 59) # leap seconds support
return datetime.datetime(y, m, d, hh, mm, ss, ts % 1000000)


class DecimalType(FractionalType):
Expand Down