Revert "[SPARK-19561] [PYTHON] cast TimestampType.toInternal output to long"
This reverts commit 711addd46e
.
This commit is contained in:
parent
8e41c2eed8
commit
47b2f68a88
|
@ -1555,12 +1555,6 @@ class SQLTests(ReusedPySparkTestCase):
|
|||
self.assertEqual(now, now1)
|
||||
self.assertEqual(now, utcnow1)
|
||||
|
||||
# regression test for SPARK-19561
|
||||
def test_datetime_at_epoch(self):
|
||||
epoch = datetime.datetime.fromtimestamp(0)
|
||||
df = self.spark.createDataFrame([Row(date=epoch)])
|
||||
self.assertEqual(df.first()['date'], epoch)
|
||||
|
||||
def test_decimal(self):
|
||||
from decimal import Decimal
|
||||
schema = StructType([StructField("decimal", DecimalType(10, 5))])
|
||||
|
|
|
@ -189,7 +189,7 @@ class TimestampType(AtomicType):
|
|||
if dt is not None:
|
||||
seconds = (calendar.timegm(dt.utctimetuple()) if dt.tzinfo
|
||||
else time.mktime(dt.timetuple()))
|
||||
return long(seconds) * 1000000 + dt.microsecond
|
||||
return int(seconds) * 1000000 + dt.microsecond
|
||||
|
||||
def fromInternal(self, ts):
|
||||
if ts is not None:
|
||||
|
|
Loading…
Reference in a new issue