Skip to content
Snippets Groups Projects
Commit 60103ecd authored by Brennan Ashton's avatar Brennan Ashton Committed by Michael Armbrust
Browse files

[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 <bashton@brennanashton.com>

Closes #8016 from btashton/patch-1.
parent 70fe5588
No related branches found
No related tags found
No related merge requests found
...@@ -566,8 +566,7 @@ class DataFrame(object): ...@@ -566,8 +566,7 @@ class DataFrame(object):
if on is None or len(on) == 0: if on is None or len(on) == 0:
jdf = self._jdf.join(other._jdf) jdf = self._jdf.join(other._jdf)
elif isinstance(on[0], basestring):
if isinstance(on[0], basestring):
jdf = self._jdf.join(other._jdf, self._jseq(on)) jdf = self._jdf.join(other._jdf, self._jseq(on))
else: else:
assert isinstance(on[0], Column), "on should be Column or list of Column" assert isinstance(on[0], Column), "on should be Column or list of Column"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment