Skip to content

Commit

Permalink
Fix minor nits found
Browse files Browse the repository at this point in the history
  • Loading branch information
HyukjinKwon committed Jan 17, 2018
1 parent c6ed44a commit 08ffa1c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion python/pyspark/sql/catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def registerFunction(self, name, f, returnType=None):
for :func:`spark.udf.register`.
.. note:: Deprecated in 2.3.0. Use :func:`spark.udf.register` instead.
.. versionadded:: 2.0
""" % _register_doc[:_register_doc.rfind('versionadded::')]
""" % _register_doc[:_register_doc.rfind('.. versionadded::')]

@since(2.0)
def isCached(self, tableName):
Expand Down
4 changes: 2 additions & 2 deletions python/pyspark/sql/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def registerFunction(self, name, f, returnType=None):
:func:`spark.udf.register`.
.. note:: Deprecated in 2.3.0. Use :func:`spark.udf.register` instead.
.. versionadded:: 1.2
""" % _register_doc[:_register_doc.rfind('versionadded::')]
""" % _register_doc[:_register_doc.rfind('.. versionadded::')]

def registerJavaFunction(self, name, javaClassName, returnType=None):
warnings.warn(
Expand All @@ -200,7 +200,7 @@ def registerJavaFunction(self, name, javaClassName, returnType=None):
:func:`spark.udf.registerJavaFunction`
.. note:: Deprecated in 2.3.0. Use :func:`spark.udf.registerJavaFunction` instead.
.. versionadded:: 2.1
""" % _registerJavaFunction_doc[:_registerJavaFunction_doc.rfind('versionadded::')]
""" % _registerJavaFunction_doc[:_registerJavaFunction_doc.rfind('.. versionadded::')]

# TODO(andrew): delete this once we refactor things to take in SparkSession
def _inferSchema(self, rdd, samplingRatio=None):
Expand Down
16 changes: 8 additions & 8 deletions python/pyspark/sql/udf.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ def asNondeterministic(self):

class UDFRegistration(object):
"""
Wrapper for user-defined function registration.
Wrapper for user-defined function registration. This instance can be accessed by
`spark.udf` or `sqlContext.udf`.
.. versionadded:: 1.3.1
"""
Expand Down Expand Up @@ -300,17 +301,17 @@ def registerJavaFunction(self, name, javaClassName, returnType=None):
In addition to a name and the function itself, the return type can be optionally specified.
When the return type is not specified we would infer it via reflection.
:param name: name of the user-defined function
:param name: name of the user-defined function
:param javaClassName: fully qualified name of java class
:param returnType: a :class:`pyspark.sql.types.DataType` object
>>> from pyspark.sql.types import IntegerType
>>> spark.udf.registerJavaFunction("javaStringLength",
... "test.org.apache.spark.sql.JavaStringLength", IntegerType())
>>> spark.udf.registerJavaFunction(
... "javaStringLength", "test.org.apache.spark.sql.JavaStringLength", IntegerType())
>>> spark.sql("SELECT javaStringLength('test')").collect()
[Row(UDF:javaStringLength(test)=4)]
>>> spark.udf.registerJavaFunction("javaStringLength2",
... "test.org.apache.spark.sql.JavaStringLength")
>>> spark.udf.registerJavaFunction(
... "javaStringLength2", "test.org.apache.spark.sql.JavaStringLength")
>>> spark.sql("SELECT javaStringLength2('test')").collect()
[Row(UDF:javaStringLength2(test)=4)]
"""
Expand All @@ -328,8 +329,7 @@ def registerJavaUDAF(self, name, javaClassName):
:param name: name of the user-defined aggregate function
:param javaClassName: fully qualified name of java class
>>> spark.udf.registerJavaUDAF("javaUDAF",
... "test.org.apache.spark.sql.MyDoubleAvg")
>>> spark.udf.registerJavaUDAF("javaUDAF", "test.org.apache.spark.sql.MyDoubleAvg")
>>> df = spark.createDataFrame([(1, "a"),(2, "b"), (3, "a")],["id", "name"])
>>> df.registerTempTable("df")
>>> spark.sql("SELECT name, javaUDAF(id) as avg from df group by name").collect()
Expand Down

0 comments on commit 08ffa1c

Please sign in to comment.