Repository: spark Updated Branches: refs/heads/branch-1.5 b515f890d -> 8629c33b6
[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 <bash...@brennanashton.com> Closes #8016 from btashton/patch-1. (cherry picked from commit 60103ecd3d9c92709a5878be7ebd57012813ab48) Signed-off-by: Michael Armbrust <mich...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8629c33b Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8629c33b Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8629c33b Branch: refs/heads/branch-1.5 Commit: 8629c33b616d4e3548b64f7681ebcd9c9c4195fd Parents: b515f89 Author: Brennan Ashton <bash...@brennanashton.com> Authored: Wed Aug 12 11:57:30 2015 -0700 Committer: Michael Armbrust <mich...@databricks.com> Committed: Wed Aug 12 11:57:40 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/8629c33b/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-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
