You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by da...@apache.org on 2015/07/10 22:05:27 UTC
spark git commit: [HOTFIX] fix flaky test in PySpark SQL
Repository: spark
Updated Branches:
refs/heads/master c185f3a45 -> 05ac023dc
[HOTFIX] fix flaky test in PySpark SQL
It may loss precision in microseconds when using float for it.
Author: Davies Liu <da...@databricks.com>
Closes #7344 from davies/fix_date_test and squashes the following commits:
249ec61 [Davies Liu] fix flaky test
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/05ac023d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/05ac023d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/05ac023d
Branch: refs/heads/master
Commit: 05ac023dc8d9004a27c2f06ee875b0ff3743ccdd
Parents: c185f3a
Author: Davies Liu <da...@databricks.com>
Authored: Fri Jul 10 13:05:23 2015 -0700
Committer: Davies Liu <da...@gmail.com>
Committed: Fri Jul 10 13:05:23 2015 -0700
----------------------------------------------------------------------
python/pyspark/sql/tests.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/05ac023d/python/pyspark/sql/tests.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/tests.py b/python/pyspark/sql/tests.py
index 4d7cad5..ed90333 100644
--- a/python/pyspark/sql/tests.py
+++ b/python/pyspark/sql/tests.py
@@ -705,11 +705,12 @@ class SQLTests(ReusedPySparkTestCase):
def test_time_with_timezone(self):
day = datetime.date.today()
now = datetime.datetime.now()
- ts = time.mktime(now.timetuple()) + now.microsecond / 1e6
+ ts = time.mktime(now.timetuple())
# class in __main__ is not serializable
from pyspark.sql.tests import UTC
utc = UTC()
- utcnow = datetime.datetime.fromtimestamp(ts, utc)
+ utcnow = datetime.datetime.utcfromtimestamp(ts) # without microseconds
+ utcnow = datetime.datetime(*(utcnow.timetuple()[:6] + (now.microsecond, utc)))
df = self.sqlCtx.createDataFrame([(day, now, utcnow)])
day1, now1, utcnow1 = df.first()
self.assertEqual(day1, day)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org