diff options
| author | 云峤 <chensong.cs@alibaba-inc.com> | 2015-05-05 13:23:53 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-05-05 13:23:53 -0700 |
| commit | 735bc3d042b1e3e12de57b66f166af14254ad314 (patch) | |
| tree | 853b8c985baf71c78ab51ddc7724dfad630523c6 /python/pyspark/sql/dataframe.py | |
| parent | 489700c809a7c0a836538f3d0bd58bed609e8768 (diff) | |
| download | spark-735bc3d042b1e3e12de57b66f166af14254ad314.tar.gz spark-735bc3d042b1e3e12de57b66f166af14254ad314.tar.bz2 spark-735bc3d042b1e3e12de57b66f166af14254ad314.zip | |
[SPARK-7294][SQL] ADD BETWEEN
Author: 云峤 <chensong.cs@alibaba-inc.com>
Author: kaka1992 <kaka_1992@163.com>
Closes #5839 from kaka1992/master and squashes the following commits:
b15360d [kaka1992] Fix python unit test in sql/test. =_= I forget to commit this file last time.
f928816 [kaka1992] Fix python style in sql/test.
d2e7f72 [kaka1992] Fix python style in sql/test.
c54d904 [kaka1992] Fix empty map bug.
7e64d1e [云峤] Update
7b9b858 [云峤] undo
f080f8d [云峤] update pep8
76f0c51 [云峤] Merge remote-tracking branch 'remotes/upstream/master'
7d62368 [云峤] [SPARK-7294] ADD BETWEEN
baf839b [云峤] [SPARK-7294] ADD BETWEEN
d11d5b9 [云峤] [SPARK-7294] ADD BETWEEN
Diffstat (limited to 'python/pyspark/sql/dataframe.py')
| -rw-r--r-- | python/pyspark/sql/dataframe.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py index 17448b38c3..24f370543d 100644 --- a/python/pyspark/sql/dataframe.py +++ b/python/pyspark/sql/dataframe.py @@ -1405,6 +1405,13 @@ class Column(object): raise TypeError("unexpected type: %s" % type(dataType)) return Column(jc) + @ignore_unicode_prefix + def between(self, lowerBound, upperBound): + """ A boolean expression that is evaluated to true if the value of this + expression is between the given columns. + """ + return (self >= lowerBound) & (self <= upperBound) + def __repr__(self): return 'Column<%s>' % self._jc.toString().encode('utf8') |