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 2015/03/21 01:27:09 UTC

[04/50] [abbrv] incubator-kylin git commit: fix

fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/bd9fc315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/bd9fc315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/bd9fc315

Branch: refs/heads/streaming-localdict
Commit: bd9fc315bdb8f41f907f0bef07109ca16b0e41b1
Parents: 303f8ff
Author: qianhao.zhou <qi...@ebay.com>
Authored: Wed Mar 18 16:00:10 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Wed Mar 18 16:00:10 2015 +0800

----------------------------------------------------------------------
 .../invertedindex/index/TableRecordInfo.java    | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bd9fc315/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfo.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfo.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfo.java
index a3af176..7d87f99 100644
--- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfo.java
+++ b/invertedindex/src/main/java/org/apache/kylin/invertedindex/index/TableRecordInfo.java
@@ -18,10 +18,12 @@
 
 package org.apache.kylin.invertedindex.index;
 
+import com.google.common.collect.Maps;
 import org.apache.kylin.dict.Dictionary;
 import org.apache.kylin.invertedindex.IISegment;
 import org.apache.kylin.invertedindex.model.IIDesc;
 import org.apache.kylin.metadata.measure.fixedlen.FixedLenMeasureCodec;
+import org.apache.kylin.metadata.model.ColumnDesc;
 import org.apache.kylin.metadata.model.DataType;
 import org.apache.kylin.metadata.model.TblColRef;
 
@@ -72,19 +74,19 @@ public class TableRecordInfo {
             isMetric[i] = desc.isMetricsCol(i);
             dataTypes[i] = tblColRef.getDatatype();
             if (isMetric[i]) {
-                final DataType dataType = DataType.getInstance(tblColRef.getColumn().getDatatype());
-                if (dataType.isNumberFamily()) {
-                    lengths[i] = 16;
-                } else if (dataType.isStringFamily()){
-                    lengths[i] = 256;
-                } else if (dataType.isDateTimeFamily()) {
-                    lengths[i] = 10;
-                } else {
-                    throw new RuntimeException("invalid data type:" + dataType);
-                }
+                lengths[i] = FixedLenMeasureCodec.get(DataType.getInstance(tblColRef.getColumn().getDatatype())).getLength();
             } else {
                 if (dictionaryMap.isEmpty()) {
-                    lengths[i] = FixedLenMeasureCodec.get(tblColRef.getColumn().getType()).getLength();
+                    final DataType dataType = DataType.getInstance(tblColRef.getColumn().getDatatype());
+                    if (dataType.isNumberFamily()) {
+                        lengths[i] = 16;
+                    } else if (dataType.isStringFamily()){
+                        lengths[i] = 256;
+                    } else if (dataType.isDateTimeFamily()) {
+                        lengths[i] = 10;
+                    } else {
+                        throw new RuntimeException("invalid data type:" + dataType);
+                    }
                     dictMaxIds[i] = Integer.MAX_VALUE;
                 } else {
                     final Dictionary<?> dictionary = dictionaryMap.get(i);