aboutsummaryrefslogtreecommitdiff
path: root/python/pyspark/sql/dataframe.py
diff options
context:
space:
mode:
authorReynold Xin <rxin@databricks.com>2016-02-13 21:06:31 -0800
committerReynold Xin <rxin@databricks.com>2016-02-13 21:06:31 -0800
commit354d4c24be892271bd9a9eab6ceedfbc5d671c9c (patch)
treec0503ad0c303e6db4882bdbfa356fb78a8dd32fb /python/pyspark/sql/dataframe.py
parent388cd9ea8db2e438ebef9dfb894298f843438c43 (diff)
downloadspark-354d4c24be892271bd9a9eab6ceedfbc5d671c9c.tar.gz
spark-354d4c24be892271bd9a9eab6ceedfbc5d671c9c.tar.bz2
spark-354d4c24be892271bd9a9eab6ceedfbc5d671c9c.zip
[SPARK-13296][SQL] Move UserDefinedFunction into sql.expressions.
This pull request has the following changes: 1. Moved UserDefinedFunction into expressions package. This is more consistent with how we structure the packages for window functions and UDAFs. 2. Moved UserDefinedPythonFunction into execution.python package, so we don't have a random private class in the top level sql package. 3. Move everything in execution/python.scala into the newly created execution.python package. Most of the diffs are just straight copy-paste. Author: Reynold Xin <rxin@databricks.com> Closes #11181 from rxin/SPARK-13296.
Diffstat (limited to 'python/pyspark/sql/dataframe.py')
-rw-r--r--python/pyspark/sql/dataframe.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py
index 3104e41407..83b034fe77 100644
--- a/python/pyspark/sql/dataframe.py
+++ b/python/pyspark/sql/dataframe.py
@@ -262,7 +262,7 @@ class DataFrame(object):
[Row(age=2, name=u'Alice'), Row(age=5, name=u'Bob')]
"""
with SCCallSiteSync(self._sc) as css:
- port = self._sc._jvm.org.apache.spark.sql.execution.EvaluatePython.takeAndServe(
+ port = self._sc._jvm.org.apache.spark.sql.execution.python.EvaluatePython.takeAndServe(
self._jdf, num)
return list(_load_from_socket(port, BatchedSerializer(PickleSerializer())))