Repository: spark
Updated Branches:
  refs/heads/branch-1.1 2a8117a99 -> b5f808398


fix flaky tests

Python 2.6 does not handle float error well as 2.7+

Author: Davies Liu <[email protected]>

Closes #1910 from davies/fix_test and squashes the following commits:

7e51200 [Davies Liu] fix flaky tests

(cherry picked from commit 882da57a1c8c075a87909d516b169b624941a6ec)
Signed-off-by: Michael Armbrust <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b5f80839
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b5f80839
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b5f80839

Branch: refs/heads/branch-1.1
Commit: b5f80839806e258de7651d851ef01697eb53c127
Parents: 2a8117a
Author: Davies Liu <[email protected]>
Authored: Tue Aug 12 16:26:01 2014 -0700
Committer: Michael Armbrust <[email protected]>
Committed: Tue Aug 12 16:26:11 2014 -0700

----------------------------------------------------------------------
 python/pyspark/sql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b5f80839/python/pyspark/sql.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql.py b/python/pyspark/sql.py
index 3604046..27f1d2d 100644
--- a/python/pyspark/sql.py
+++ b/python/pyspark/sql.py
@@ -1094,7 +1094,7 @@ class SQLContext:
         ...   "SELECT byte1 - 1 AS byte1, byte2 + 1 AS byte2, " +
         ...     "short1 + 1 AS short1, short2 - 1 AS short2, int - 1 AS int, " 
+
         ...     "float + 1.1 as float FROM table2").collect()
-        [Row(byte1=126, byte2=-127, short1=-32767, short2=32766, 
int=2147483646, float=2.1)]
+        [Row(byte1=126, byte2=-127, short1=-32767, short2=32766, 
int=2147483646, float=2.1...)]
 
         >>> rdd = sc.parallelize([(127, -32768, 1.0,
         ...     datetime(2010, 1, 1, 1, 1, 1),


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to