Skip to content

Commit abe36c5

Browse files
committed
[SPARK-16086] [SQL] fix Python UDF without arguments (for 1.6)
## What changes were proposed in this pull request? Fix the bug for Python UDF that does not have any arguments. ## How was this patch tested? Added regression tests. Author: Davies Liu <[email protected]> Closes #13793 from davies/fix_no_arguments.
1 parent db86e7f commit abe36c5

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

python/pyspark/sql/tests.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,11 @@ def test_udf2(self):
305305
[res] = self.sqlCtx.sql("SELECT strlen(a) FROM test WHERE strlen(a) > 1").collect()
306306
self.assertEqual(4, res[0])
307307

308+
def test_udf_without_arguments(self):
309+
self.sqlCtx.registerFunction("foo", lambda: "bar")
310+
[row] = self.sqlCtx.sql("SELECT foo()").collect()
311+
self.assertEqual(row[0], "bar")
312+
308313
def test_udf_with_array_type(self):
309314
d = [Row(l=list(range(3)), d={"key": list(range(5))})]
310315
rdd = self.sc.parallelize(d)

python/pyspark/sql/types.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,19 +1195,16 @@ def __new__(self, *args, **kwargs):
11951195
if args and kwargs:
11961196
raise ValueError("Can not use both args "
11971197
"and kwargs to create Row")
1198-
if args:
1199-
# create row class or objects
1200-
return tuple.__new__(self, args)
1201-
1202-
elif kwargs:
1198+
if kwargs:
12031199
# create row objects
12041200
names = sorted(kwargs.keys())
12051201
row = tuple.__new__(self, [kwargs[n] for n in names])
12061202
row.__fields__ = names
12071203
return row
12081204

12091205
else:
1210-
raise ValueError("No args or kwargs")
1206+
# create row class or objects
1207+
return tuple.__new__(self, args)
12111208

12121209
def asDict(self, recursive=False):
12131210
"""

0 commit comments

Comments
 (0)