diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-05-11 11:35:16 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-05-11 11:35:16 -0700 |
| commit | 0a4844f90a712e796c9404b422cea76d21a5d2e3 (patch) | |
| tree | bd65392cedca083acd4759b25687a24e6a0a29a1 /python | |
| parent | 1b46556999ca126cb593ef052d24afcb75383223 (diff) | |
| download | spark-0a4844f90a712e796c9404b422cea76d21a5d2e3.tar.gz spark-0a4844f90a712e796c9404b422cea76d21a5d2e3.tar.bz2 spark-0a4844f90a712e796c9404b422cea76d21a5d2e3.zip | |
[SPARK-7462] By default retain group by columns in aggregate
Updated Java, Scala, Python, and R.
Author: Reynold Xin <rxin@databricks.com>
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Closes #5996 from rxin/groupby-retain and squashes the following commits:
aac7119 [Reynold Xin] Merge branch 'groupby-retain' of github.com:rxin/spark into groupby-retain
f6858f6 [Reynold Xin] Merge branch 'master' into groupby-retain
5f923c0 [Reynold Xin] Merge pull request #15 from shivaram/sparkr-groupby-retrain
c1de670 [Shivaram Venkataraman] Revert workaround in SparkR to retain grouped cols Based on reverting code added in commit https://github.com/amplab-extras/spark/commit/9a6be746efc9fafad88122fa2267862ef87aa0e1
b8b87e1 [Reynold Xin] Fixed DataFrameJoinSuite.
d910141 [Reynold Xin] Updated rest of the files
1e6e666 [Reynold Xin] [SPARK-7462] By default retain group by columns in aggregate
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/sql/dataframe.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py index a9697999e8..c2fa6c8738 100644 --- a/python/pyspark/sql/dataframe.py +++ b/python/pyspark/sql/dataframe.py @@ -1069,7 +1069,7 @@ class GroupedData(object): >>> from pyspark.sql import functions as F >>> gdf.agg(F.min(df.age)).collect() - [Row(MIN(age)=2), Row(MIN(age)=5)] + [Row(name=u'Alice', MIN(age)=2), Row(name=u'Bob', MIN(age)=5)] """ assert exprs, "exprs should not be empty" if len(exprs) == 1 and isinstance(exprs[0], dict): |