You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/09/13 07:16:56 UTC
kylin git commit: minor, in Tuple,
measure auto convert to short and byte
Repository: kylin
Updated Branches:
refs/heads/master 0362c2bb8 -> 5dc5ac85f
minor, in Tuple, measure auto convert to short and byte
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5dc5ac85
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5dc5ac85
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5dc5ac85
Branch: refs/heads/master
Commit: 5dc5ac85fc2ac0671ff2e60c6538ea5448b67c83
Parents: 0362c2b
Author: Li Yang <li...@apache.org>
Authored: Tue Sep 13 15:16:47 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Tue Sep 13 15:16:47 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/metadata/tuple/Tuple.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/5dc5ac85/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java
index 54e5786..aaf9aa9 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/Tuple.java
@@ -117,6 +117,10 @@ public class Tuple implements ITuple {
fieldValue = ((BigDecimal) fieldValue).doubleValue();
} else if ("integer".equals(dataType) && fieldValue instanceof Number) {
fieldValue = ((Number) fieldValue).intValue();
+ } else if ("smallint".equals(dataType) && fieldValue instanceof Number) {
+ fieldValue = ((Number) fieldValue).shortValue();
+ } else if ("tinyint".equals(dataType)) {
+ fieldValue = ((Number) fieldValue).byteValue();
} else if ("float".equals(dataType) && fieldValue instanceof BigDecimal) {
fieldValue = ((BigDecimal) fieldValue).floatValue();
} else if ("date".equals(dataType) && fieldValue instanceof Long) {
@@ -185,11 +189,11 @@ public class Tuple implements ITuple {
return Long.valueOf(DateFormat.stringToMillis(strValue));
} else if ("tinyint".equals(dataTypeName)) {
return Byte.valueOf(strValue);
- } else if ("short".equals(dataTypeName) || "smallint".equals(dataTypeName)) {
+ } else if ("smallint".equals(dataTypeName)) {
return Short.valueOf(strValue);
} else if ("integer".equals(dataTypeName)) {
return Integer.valueOf(strValue);
- } else if ("long".equals(dataTypeName) || "bigint".equals(dataTypeName)) {
+ } else if ("bigint".equals(dataTypeName)) {
return Long.valueOf(strValue);
} else if ("double".equals(dataTypeName)) {
return Double.valueOf(strValue);