You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/12/02 04:44:28 UTC
kylin git commit: temp
Repository: kylin
Updated Branches:
refs/heads/KYLIN-242-new bb192414f -> b8eed3f61
temp
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b8eed3f6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b8eed3f6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b8eed3f6
Branch: refs/heads/KYLIN-242-new
Commit: b8eed3f618825acf4f6dad5ab62dd8d6bce638b5
Parents: bb19241
Author: honma <ho...@ebay.com>
Authored: Wed Dec 2 11:50:30 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Dec 2 11:50:30 2015 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java | 6 ++----
.../main/java/org/apache/kylin/cube/model/RowKeyColDesc.java | 2 +-
.../src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java | 6 ++++++
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b8eed3f6/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
index 62df1e9..6d899f4 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeSegment.java
@@ -31,11 +31,11 @@ import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.cube.model.CubeJoinedFlatTableDesc;
import org.apache.kylin.dict.Dictionary;
import org.apache.kylin.dict.IDictionaryAware;
-import org.apache.kylin.metadata.model.IBuildable;
import org.apache.kylin.metadata.model.IJoinedFlatTableDesc;
-import org.apache.kylin.metadata.model.IStorageAware;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.model.TblColRef;
+import org.apache.kylin.metadata.realization.IRealization;
+import org.apache.kylin.metadata.realization.IRealizationSegment;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
@@ -43,8 +43,6 @@ import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
-import org.apache.kylin.metadata.realization.IRealization;
-import org.apache.kylin.metadata.realization.IRealizationSegment;
@JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
public class CubeSegment implements Comparable<CubeSegment>, IDictionaryAware, IRealizationSegment {
http://git-wip-us.apache.org/repos/asf/kylin/blob/b8eed3f6/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
index 59037b7..7c26e8f 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyColDesc.java
@@ -101,7 +101,7 @@ public class RowKeyColDesc {
if (this.colEncoding.type == ColEncodingType.FIXED_LEN) {
return (Integer) this.colEncoding.param;
} else {
- throw new IllegalStateException("Not knowing the col's length, col: " + this.column + " encoding: " + this.encoding + " encoding type: " + this.colEncoding.type);
+ return 0;
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/b8eed3f6/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
index d085067..7254df0 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/RowKeyDesc.java
@@ -67,6 +67,12 @@ public class RowKeyDesc {
return getColDesc(col).getBitIndex();
}
+ /**
+ * caller of this method must make sure that col is NOT using dictionary
+ * otherwise this will always return 0 for dict columns
+ * @param col
+ * @return
+ */
public int getColumnLength(TblColRef col) {
return getColDesc(col).getLength();
}