You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2016/04/20 00:25:04 UTC
[12/58] [abbrv] hive git commit: HIVE-13320 : Apply HIVE-11544 to
explicit conversions as well as implicit ones (Nita Dembla,
Gopal V via Gunther Hagleitner) Signed-off-by: Ashutosh Chauhan
HIVE-13320 : Apply HIVE-11544 to explicit conversions as well as implicit ones (Nita Dembla, Gopal V via Gunther Hagleitner)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e98f7ac5
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e98f7ac5
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e98f7ac5
Branch: refs/heads/llap
Commit: e98f7ac555c946c481e8796c9b2d40b790a19b22
Parents: eb56666
Author: Nita Dembla <nd...@hortonworks.com>
Authored: Thu Apr 7 09:54:00 2016 -0500
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Sat Apr 9 15:31:31 2016 -0700
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java | 7 +++++--
ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java | 4 ++++
ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java | 4 ++++
ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java | 4 ++++
ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java | 4 ++++
ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java | 4 ++++
6 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/e98f7ac5/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java
index 159dd0f..efae82d 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToByte.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.lazy.LazyByte;
+import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
@@ -166,9 +167,11 @@ public class UDFToByte extends UDF {
if (i == null) {
return null;
} else {
+ if (!LazyUtils.isNumberMaybe(i.getBytes(), 0, i.getLength())) {
+ return null;
+ }
try {
- byteWritable
- .set(LazyByte.parseByte(i.getBytes(), 0, i.getLength(), 10));
+ byteWritable.set(LazyByte.parseByte(i.getBytes(), 0, i.getLength(), 10));
return byteWritable;
} catch (NumberFormatException e) {
// MySQL returns 0 if the string is not a well-formed numeric value.
http://git-wip-us.apache.org/repos/asf/hive/blob/e98f7ac5/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java
index 5763947..e932f11 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToDouble.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
+import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
@@ -164,6 +165,9 @@ public class UDFToDouble extends UDF {
if (i == null) {
return null;
} else {
+ if (!LazyUtils.isNumberMaybe(i.getBytes(), 0, i.getLength())) {
+ return null;
+ }
try {
doubleWritable.set(Double.valueOf(i.toString()));
return doubleWritable;
http://git-wip-us.apache.org/repos/asf/hive/blob/e98f7ac5/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java
index e2183f4..119eaca 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToFloat.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.hive.serde2.io.DoubleWritable;
import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
+import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
@@ -165,6 +166,9 @@ public class UDFToFloat extends UDF {
if (i == null) {
return null;
} else {
+ if (!LazyUtils.isNumberMaybe(i.getBytes(), 0, i.getLength())) {
+ return null;
+ }
try {
floatWritable.set(Float.valueOf(i.toString()));
return floatWritable;
http://git-wip-us.apache.org/repos/asf/hive/blob/e98f7ac5/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
index 5f5d1fe..fc6540e 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToInteger.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.lazy.LazyInteger;
+import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
@@ -167,6 +168,9 @@ public class UDFToInteger extends UDF {
if (i == null) {
return null;
} else {
+ if (!LazyUtils.isNumberMaybe(i.getBytes(), 0, i.getLength())) {
+ return null;
+ }
try {
intWritable.set(LazyInteger
.parseInt(i.getBytes(), 0, i.getLength(), 10));
http://git-wip-us.apache.org/repos/asf/hive/blob/e98f7ac5/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java
index 3eeabea..3d85abd 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToLong.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.lazy.LazyLong;
+import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
@@ -177,6 +178,9 @@ public class UDFToLong extends UDF {
if (i == null) {
return null;
} else {
+ if (!LazyUtils.isNumberMaybe(i.getBytes(), 0, i.getLength())) {
+ return null;
+ }
try {
longWritable
.set(LazyLong.parseLong(i.getBytes(), 0, i.getLength(), 10));
http://git-wip-us.apache.org/repos/asf/hive/blob/e98f7ac5/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java
index b9065b2..24533d6 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/UDFToShort.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
import org.apache.hadoop.hive.serde2.io.ShortWritable;
import org.apache.hadoop.hive.serde2.io.TimestampWritable;
import org.apache.hadoop.hive.serde2.lazy.LazyShort;
+import org.apache.hadoop.hive.serde2.lazy.LazyUtils;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
@@ -167,6 +168,9 @@ public class UDFToShort extends UDF {
if (i == null) {
return null;
} else {
+ if (!LazyUtils.isNumberMaybe(i.getBytes(), 0, i.getLength())) {
+ return null;
+ }
try {
shortWritable.set(LazyShort.parseShort(i.getBytes(), 0, i.getLength(),
10));