From cbc37007aa07991135a3da13ad566be76a0ef577 Mon Sep 17 00:00:00 2001
From: Wenchen Fan <wenchen@databricks.com>
Date: Tue, 7 Mar 2017 17:15:39 -0800
Subject: [PATCH] Revert "[SPARK-19561] [PYTHON] cast TimestampType.toInternal
output to long"
This reverts commit 6f4684622a951806bebe7652a14f7d1ce03e24c7.
---
python/pyspark/sql/tests.py | 6 ------
python/pyspark/sql/types.py | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/python/pyspark/sql/tests.py b/python/pyspark/sql/tests.py
index 4140c2d11c..877ab88d17 100644
--- a/python/pyspark/sql/tests.py
+++ b/python/pyspark/sql/tests.py
@@ -1360,12 +1360,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))])
diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py
index d4b9fa8545..4a023123b6 100644
--- a/python/pyspark/sql/types.py
+++ b/python/pyspark/sql/types.py
@@ -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:
--
GitLab