diff options
| author | Brennan Ashton <bashton@brennanashton.com> | 2015-08-12 11:57:30 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2015-08-12 11:57:30 -0700 |
| commit | 60103ecd3d9c92709a5878be7ebd57012813ab48 (patch) | |
| tree | 4070fd68b67831869e4d0456a5eeed9c62a8442c /python/pyspark/sql/dataframe.py | |
| parent | 70fe558867ccb4bcff6ec673438b03608bb02252 (diff) | |
| download | spark-60103ecd3d9c92709a5878be7ebd57012813ab48.tar.gz spark-60103ecd3d9c92709a5878be7ebd57012813ab48.tar.bz2 spark-60103ecd3d9c92709a5878be7ebd57012813ab48.zip | |
[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.
Diffstat (limited to 'python/pyspark/sql/dataframe.py')
| -rw-r--r-- | python/pyspark/sql/dataframe.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py index 47d5a6a43a..09647ff6d0 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" |