You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/04/08 12:36:47 UTC
spark git commit: [SPARK-14402][HOTFIX] Fix ExpressionDescription
annotation
Repository: spark
Updated Branches:
refs/heads/master 73b56a3c6 -> 644709801
[SPARK-14402][HOTFIX] Fix ExpressionDescription annotation
## What changes were proposed in this pull request?
Fix for the error introduced in https://github.com/apache/spark/commit/c59abad052b7beec4ef550049413e95578e545be:
```
/Users/jacek/dev/oss/spark/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala:626: error: annotation argument needs to be a constant; found: "_FUNC_(str) - ".+("Returns str, with the first letter of each word in uppercase, all other letters in ").+("lowercase. Words are delimited by white space.")
"Returns str, with the first letter of each word in uppercase, all other letters in " +
^
```
## How was this patch tested?
Local build
Author: Jacek Laskowski <ja...@japila.pl>
Closes #12192 from jaceklaskowski/SPARK-14402-HOTFIX.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/64470980
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/64470980
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/64470980
Branch: refs/heads/master
Commit: 6447098013fad708769423ef108a2b071e0930d8
Parents: 73b56a3
Author: Jacek Laskowski <ja...@japila.pl>
Authored: Fri Apr 8 11:36:41 2016 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Fri Apr 8 11:36:41 2016 +0100
----------------------------------------------------------------------
.../spark/sql/catalyst/expressions/stringExpressions.scala | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/64470980/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
index b6ea03c..7e0e7a8 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
@@ -622,9 +622,9 @@ case class FormatString(children: Expression*) extends Expression with ImplicitC
* Words are delimited by whitespace.
*/
@ExpressionDescription(
- usage = "_FUNC_(str) - " +
- "Returns str, with the first letter of each word in uppercase, all other letters in " +
- "lowercase. Words are delimited by white space.",
+ usage =
+ """_FUNC_(str) - Returns str with the first letter of each word in uppercase.
+ All other letters are in lowercase. Words are delimited by white space.""",
extended = "> SELECT initcap('sPark sql');\n 'Spark Sql'")
case class InitCap(child: Expression) extends UnaryExpression with ImplicitCastInputTypes {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org