Repository: spark Updated Branches: refs/heads/master b385ce388 -> 9269036d8
[SPARK-11565] Replace deprecated DigestUtils.shaHex call Author: Gábor Lipták <glip...@gmail.com> Closes #9532 from gliptak/SPARK-11565. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9269036d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9269036d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9269036d Branch: refs/heads/master Commit: 9269036d8c8bb60097fd9aacfb7a89d8e873d978 Parents: b385ce3 Author: Gábor Lipták <glip...@gmail.com> Authored: Wed Feb 10 09:52:35 2016 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Wed Feb 10 09:52:35 2016 +0000 ---------------------------------------------------------------------- sql/catalyst/pom.xml | 4 ++++ .../scala/org/apache/spark/sql/catalyst/expressions/misc.scala | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9269036d/sql/catalyst/pom.xml ---------------------------------------------------------------------- diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index c2ad9b9..5d1d9ed 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -75,6 +75,10 @@ <groupId>org.antlr</groupId> <artifactId>antlr-runtime</artifactId> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> </dependencies> <build> <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> http://git-wip-us.apache.org/repos/asf/spark/blob/9269036d/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 28e4f50..dcbb594 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 @@ -143,11 +143,11 @@ case class Sha1(child: Expression) extends UnaryExpression with ImplicitCastInpu override def inputTypes: Seq[DataType] = Seq(BinaryType) protected override def nullSafeEval(input: Any): Any = - UTF8String.fromString(DigestUtils.shaHex(input.asInstanceOf[Array[Byte]])) + UTF8String.fromString(DigestUtils.sha1Hex(input.asInstanceOf[Array[Byte]])) override def genCode(ctx: CodegenContext, ev: ExprCode): String = { defineCodeGen(ctx, ev, c => - s"UTF8String.fromString(org.apache.commons.codec.digest.DigestUtils.shaHex($c))" + s"UTF8String.fromString(org.apache.commons.codec.digest.DigestUtils.sha1Hex($c))" ) } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org