You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by yh...@apache.org on 2015/12/29 19:35:27 UTC

spark git commit: [SPARK-12530][BUILD] Fix build break at Spark-Master-Maven-Snapshots from #1293

Repository: spark
Updated Branches:
  refs/heads/master d80cc90b5 -> 8e629b10c


[SPARK-12530][BUILD] Fix build break at Spark-Master-Maven-Snapshots from #1293

Compilation error caused due to string concatenations that are not a constant
Use raw string literal to avoid string concatenations

https://amplab.cs.berkeley.edu/jenkins/view/Spark-Packaging/job/Spark-Master-Maven-Snapshots/1293/

Author: Kazuaki Ishizaki <is...@jp.ibm.com>

Closes #10488 from kiszk/SPARK-12530.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8e629b10
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8e629b10
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8e629b10

Branch: refs/heads/master
Commit: 8e629b10cb5167926356e2f23d3c35610aa87ffe
Parents: d80cc90
Author: Kazuaki Ishizaki <is...@jp.ibm.com>
Authored: Tue Dec 29 10:35:23 2015 -0800
Committer: Yin Huai <yh...@databricks.com>
Committed: Tue Dec 29 10:35:23 2015 -0800

----------------------------------------------------------------------
 .../org/apache/spark/sql/catalyst/expressions/misc.scala      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/8e629b10/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
index 97f276d..d0ec99b 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala
@@ -57,9 +57,10 @@ case class Md5(child: Expression) extends UnaryExpression with ImplicitCastInput
  * the hash length is not one of the permitted values, the return value is NULL.
  */
 @ExpressionDescription(
-  usage = "_FUNC_(input, bitLength) - Returns a checksum of SHA-2 family as a hex string of the " +
-    "input. SHA-224, SHA-256, SHA-384, and SHA-512 are supported. Bit length of 0 is equivalent " +
-    "to 256",
+  usage =
+    """_FUNC_(input, bitLength) - Returns a checksum of SHA-2 family as a hex string of the input.
+      SHA-224, SHA-256, SHA-384, and SHA-512 are supported. Bit length of 0 is equivalent to 256."""
+  ,
   extended = "> SELECT _FUNC_('Spark', 0);\n " +
     "'529bc3b07127ecb7e53a4dcf1991d9152c24537d919178022b2c42657f79a26b'")
 case class Sha2(left: Expression, right: Expression)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org