You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by cu...@apache.org on 2018/04/26 21:21:29 UTC
spark git commit: [SPARK-24057][PYTHON] put the real data type in the
AssertionError message
Repository: spark
Updated Branches:
refs/heads/master ce2f919f8 -> 4f1e38649
[SPARK-24057][PYTHON] put the real data type in the AssertionError message
## What changes were proposed in this pull request?
Print out the data type in the AssertionError message to make it more meaningful.
## How was this patch tested?
I manually tested the changed code on my local, but didn't add any test.
Author: Huaxin Gao <hu...@us.ibm.com>
Closes #21159 from huaxingao/spark-24057.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4f1e3864
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4f1e3864
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4f1e3864
Branch: refs/heads/master
Commit: 4f1e38649ebc7710850b7c40e6fb355775e7bb7f
Parents: ce2f919
Author: Huaxin Gao <hu...@us.ibm.com>
Authored: Thu Apr 26 14:21:22 2018 -0700
Committer: Bryan Cutler <cu...@gmail.com>
Committed: Thu Apr 26 14:21:22 2018 -0700
----------------------------------------------------------------------
python/pyspark/sql/types.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4f1e3864/python/pyspark/sql/types.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/types.py b/python/pyspark/sql/types.py
index 1f65348..3cd7a2e 100644
--- a/python/pyspark/sql/types.py
+++ b/python/pyspark/sql/types.py
@@ -289,7 +289,8 @@ class ArrayType(DataType):
>>> ArrayType(StringType(), False) == ArrayType(StringType())
False
"""
- assert isinstance(elementType, DataType), "elementType should be DataType"
+ assert isinstance(elementType, DataType),\
+ "elementType %s should be an instance of %s" % (elementType, DataType)
self.elementType = elementType
self.containsNull = containsNull
@@ -343,8 +344,10 @@ class MapType(DataType):
... == MapType(StringType(), FloatType()))
False
"""
- assert isinstance(keyType, DataType), "keyType should be DataType"
- assert isinstance(valueType, DataType), "valueType should be DataType"
+ assert isinstance(keyType, DataType),\
+ "keyType %s should be an instance of %s" % (keyType, DataType)
+ assert isinstance(valueType, DataType),\
+ "valueType %s should be an instance of %s" % (valueType, DataType)
self.keyType = keyType
self.valueType = valueType
self.valueContainsNull = valueContainsNull
@@ -402,8 +405,9 @@ class StructField(DataType):
... == StructField("f2", StringType(), True))
False
"""
- assert isinstance(dataType, DataType), "dataType should be DataType"
- assert isinstance(name, basestring), "field name should be string"
+ assert isinstance(dataType, DataType),\
+ "dataType %s should be an instance of %s" % (dataType, DataType)
+ assert isinstance(name, basestring), "field name %s should be string" % (name)
if not isinstance(name, str):
name = name.encode('utf-8')
self.name = name
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org