aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Laskowski <jacek@japila.pl>2016-04-08 11:36:41 +0100
committerSean Owen <sowen@cloudera.com>2016-04-08 11:36:41 +0100
commit6447098013fad708769423ef108a2b071e0930d8 (patch)
tree117e4f0ce044af9f3aa7e4ddddb39c9904d37b29
parent73b56a3c6c5c590219b42884c8bbe88b0a236987 (diff)
downloadspark-6447098013fad708769423ef108a2b071e0930d8.tar.gz
spark-6447098013fad708769423ef108a2b071e0930d8.tar.bz2
spark-6447098013fad708769423ef108a2b071e0930d8.zip
[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 <jacek@japila.pl> Closes #12192 from jaceklaskowski/SPARK-14402-HOTFIX.
-rw-r--r--sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala6
1 files changed, 3 insertions, 3 deletions
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 b6ea03cd5c..7e0e7a833b 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 {