diff options
author | Gábor Lipták <gliptak@gmail.com> | 2016-02-10 09:52:35 +0000 |
---|---|---|
committer | Sean Owen <sowen@cloudera.com> | 2016-02-10 09:52:35 +0000 |
commit | 9269036d8c8bb60097fd9aacfb7a89d8e873d978 (patch) | |
tree | 7088c26e154e2041776c4c009ee14752b8fcfb32 /sql | |
parent | b385ce38825de4b1420c5a0e8191e91fc8afecf5 (diff) | |
download | spark-9269036d8c8bb60097fd9aacfb7a89d8e873d978.tar.gz spark-9269036d8c8bb60097fd9aacfb7a89d8e873d978.tar.bz2 spark-9269036d8c8bb60097fd9aacfb7a89d8e873d978.zip |
[SPARK-11565] Replace deprecated DigestUtils.shaHex call
Author: Gábor Lipták <gliptak@gmail.com>
Closes #9532 from gliptak/SPARK-11565.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/catalyst/pom.xml | 4 | ||||
-rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/misc.scala | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index c2ad9b99f3..5d1d9edd25 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> 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 28e4f50eee..dcbb594afd 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))" ) } } |