[SPARK-16086] [SQL] fix Python UDF without arguments (for 1.6)
Fix the bug for Python UDF that does not have any arguments.
Added regression tests.
Author: Davies Liu <davies.liu@gmail.com>
Closes #13793 from davies/fix_no_arguments.
(cherry picked from commit abe36c53d1
)
Signed-off-by: Davies Liu <davies.liu@gmail.com>
This commit is contained in:
parent
e2b7eba87c
commit
a46553cbac
|
@ -318,6 +318,11 @@ class SQLTests(ReusedPySparkTestCase):
|
|||
[row] = self.spark.sql("SELECT double(add(1, 2)), add(double(2), 1)").collect()
|
||||
self.assertEqual(tuple(row), (6, 5))
|
||||
|
||||
def test_udf_without_arguments(self):
|
||||
self.sqlCtx.registerFunction("foo", lambda: "bar")
|
||||
[row] = self.sqlCtx.sql("SELECT foo()").collect()
|
||||
self.assertEqual(row[0], "bar")
|
||||
|
||||
def test_udf_with_array_type(self):
|
||||
d = [Row(l=list(range(3)), d={"key": list(range(5))})]
|
||||
rdd = self.sc.parallelize(d)
|
||||
|
|
|
@ -1401,11 +1401,7 @@ class Row(tuple):
|
|||
if args and kwargs:
|
||||
raise ValueError("Can not use both args "
|
||||
"and kwargs to create Row")
|
||||
if args:
|
||||
# create row class or objects
|
||||
return tuple.__new__(self, args)
|
||||
|
||||
elif kwargs:
|
||||
if kwargs:
|
||||
# create row objects
|
||||
names = sorted(kwargs.keys())
|
||||
row = tuple.__new__(self, [kwargs[n] for n in names])
|
||||
|
@ -1413,7 +1409,8 @@ class Row(tuple):
|
|||
return row
|
||||
|
||||
else:
|
||||
raise ValueError("No args or kwargs")
|
||||
# create row class or objects
|
||||
return tuple.__new__(self, args)
|
||||
|
||||
def asDict(self, recursive=False):
|
||||
"""
|
||||
|
|
Loading…
Reference in a new issue