Repository: spark Updated Branches: refs/heads/branch-2.0 938988757 -> 1230516d9
[SQL] Minor HashAggregateExec string output fixes ## What changes were proposed in this pull request? This PR fixes some minor `.toString` format issues for `HashAggregateExec`. Before: ``` *HashAggregate(key=[a#234L,b#235L], functions=[count(1),max(c#236L)], output=[a#234L,b#235L,count(c)#247L,max(c)#248L]) ``` After: ``` *HashAggregate(keys=[a#234L, b#235L], functions=[count(1), max(c#236L)], output=[a#234L, b#235L, count(c)#247L, max(c)#248L]) ``` ## How was this patch tested? Manually tested. Author: Cheng Lian <l...@databricks.com> Closes #13710 from liancheng/minor-agg-string-fix. (cherry picked from commit 7a89f2adbbc82a23f06638806ffc8596a7efe7f3) Signed-off-by: Andrew Or <and...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1230516d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1230516d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1230516d Branch: refs/heads/branch-2.0 Commit: 1230516d9314f55183bfa542eb7cdfac9d8dfec5 Parents: 9389887 Author: Cheng Lian <l...@databricks.com> Authored: Thu Jun 16 14:20:44 2016 -0700 Committer: Andrew Or <and...@databricks.com> Committed: Thu Jun 16 14:20:52 2016 -0700 ---------------------------------------------------------------------- .../spark/sql/execution/aggregate/HashAggregateExec.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1230516d/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala index caeeba1..54d7340 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala @@ -774,13 +774,13 @@ case class HashAggregateExec( testFallbackStartsAt match { case None => - val keyString = Utils.truncatedString(groupingExpressions, "[", ",", "]") - val functionString = Utils.truncatedString(allAggregateExpressions, "[", ",", "]") - val outputString = Utils.truncatedString(output, "[", ",", "]") + val keyString = Utils.truncatedString(groupingExpressions, "[", ", ", "]") + val functionString = Utils.truncatedString(allAggregateExpressions, "[", ", ", "]") + val outputString = Utils.truncatedString(output, "[", ", ", "]") if (verbose) { - s"HashAggregate(key=$keyString, functions=$functionString, output=$outputString)" + s"HashAggregate(keys=$keyString, functions=$functionString, output=$outputString)" } else { - s"HashAggregate(key=$keyString, functions=$functionString)" + s"HashAggregate(keys=$keyString, functions=$functionString)" } case Some(fallbackStartsAt) => s"HashAggregateWithControlledFallback $groupingExpressions " + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
