You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/08/12 20:57:34 UTC
spark git commit: [SPARK-9726] [PYTHON] PySpark DF join no longer
accepts on=None
Repository: spark
Updated Branches:
refs/heads/master 70fe55886 -> 60103ecd3
[SPARK-9726] [PYTHON] PySpark DF join no longer accepts on=None
rxin
First pull request for Spark so let me know if I am missing anything
The contribution is my original work and I license the work to the project under the project's open source license.
Author: Brennan Ashton <ba...@brennanashton.com>
Closes #8016 from btashton/patch-1.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/60103ecd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/60103ecd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/60103ecd
Branch: refs/heads/master
Commit: 60103ecd3d9c92709a5878be7ebd57012813ab48
Parents: 70fe558
Author: Brennan Ashton <ba...@brennanashton.com>
Authored: Wed Aug 12 11:57:30 2015 -0700
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Wed Aug 12 11:57:30 2015 -0700
----------------------------------------------------------------------
python/pyspark/sql/dataframe.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/60103ecd/python/pyspark/sql/dataframe.py
----------------------------------------------------------------------
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py
index 47d5a6a..09647ff 100644
--- a/python/pyspark/sql/dataframe.py
+++ b/python/pyspark/sql/dataframe.py
@@ -566,8 +566,7 @@ class DataFrame(object):
if on is None or len(on) == 0:
jdf = self._jdf.join(other._jdf)
-
- if isinstance(on[0], basestring):
+ elif isinstance(on[0], basestring):
jdf = self._jdf.join(other._jdf, self._jseq(on))
else:
assert isinstance(on[0], Column), "on should be Column or list of Column"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org