HIVE-10518 Replace US_ASCII charset with US-ASCII in encode and decode description
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5333bd39 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5333bd39 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5333bd39 Branch: refs/heads/parquet Commit: 5333bd39811dc43eae74c7ae4097b54c2d677fc2 Parents: b4b7955 Author: Alexander Pivovarov <apivova...@gmail.com> Authored: Mon Apr 27 23:23:59 2015 -0700 Committer: Alexander Pivovarov <apivova...@gmail.com> Committed: Tue May 12 14:51:25 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java | 2 +- .../org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java | 2 +- ql/src/test/results/clientpositive/udf_decode.q.out | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/5333bd39/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java index f4366c7..1236085 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDecode.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectIn @Description(name = "decode", value = "_FUNC_(bin, str) - Decode the first argument using the second argument character set", - extended = "Possible options for the character set are 'US_ASCII', 'ISO-8859-1',\n" + + extended = "Possible options for the character set are 'US-ASCII', 'ISO-8859-1',\n" + "'UTF-8', 'UTF-16BE', 'UTF-16LE', and 'UTF-16'. If either argument\n" + "is null, the result will also be null") public class GenericUDFDecode extends GenericUDF { http://git-wip-us.apache.org/repos/asf/hive/blob/5333bd39/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java index 64f8a14..56b7685 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFEncode.java @@ -42,7 +42,7 @@ import org.apache.hadoop.io.BytesWritable; @Description(name = "encode", value = "_FUNC_(str, str) - Encode the first argument using the second argument character set", -extended = "Possible options for the character set are 'US_ASCII', 'ISO-8859-1',\n" + +extended = "Possible options for the character set are 'US-ASCII', 'ISO-8859-1',\n" + "'UTF-8', 'UTF-16BE', 'UTF-16LE', and 'UTF-16'. If either argument\n" + "is null, the result will also be null") public class GenericUDFEncode extends GenericUDF { http://git-wip-us.apache.org/repos/asf/hive/blob/5333bd39/ql/src/test/results/clientpositive/udf_decode.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/udf_decode.q.out b/ql/src/test/results/clientpositive/udf_decode.q.out index 97f0acf..107712a 100644 --- a/ql/src/test/results/clientpositive/udf_decode.q.out +++ b/ql/src/test/results/clientpositive/udf_decode.q.out @@ -8,7 +8,7 @@ PREHOOK: type: DESCFUNCTION POSTHOOK: query: DESC FUNCTION EXTENDED decode POSTHOOK: type: DESCFUNCTION decode(bin, str) - Decode the first argument using the second argument character set -Possible options for the character set are 'US_ASCII', 'ISO-8859-1', +Possible options for the character set are 'US-ASCII', 'ISO-8859-1', 'UTF-8', 'UTF-16BE', 'UTF-16LE', and 'UTF-16'. If either argument is null, the result will also be null PREHOOK: query: explain select decode(binary('TestDecode1'), 'UTF-8')
