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/08/21 04:38:36 UTC
kylin git commit: KYLIN-1966 bug fix
Repository: kylin
Updated Branches:
refs/heads/master c9f576eaf -> 45cc6f477
KYLIN-1966 bug fix
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/45cc6f47
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/45cc6f47
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/45cc6f47
Branch: refs/heads/master
Commit: 45cc6f477dde9aa6d6f03c6b312460bf8707101d
Parents: c9f576e
Author: Yang Li <li...@apache.org>
Authored: Sun Aug 21 12:38:29 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sun Aug 21 12:38:29 2016 +0800
----------------------------------------------------------------------
.../cube/model/CubeJoinedFlatTableDesc.java | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/45cc6f47/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
index ebc903a..1f9d772 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
@@ -18,7 +18,6 @@
package org.apache.kylin.cube.model;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -28,7 +27,6 @@ import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.metadata.model.FunctionDesc;
import org.apache.kylin.metadata.model.IJoinedFlatTableDesc;
-import org.apache.kylin.metadata.model.JoinDesc;
import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.metadata.model.TblColRef;
@@ -50,9 +48,6 @@ public class CubeJoinedFlatTableDesc implements IJoinedFlatTableDesc {
private List<TblColRef> columnList = Lists.newArrayList();
private Map<TblColRef, Integer> columnIndexMap;
- private List<JoinDesc> cubeJoins;
-
-
public CubeJoinedFlatTableDesc(CubeDesc cubeDesc) {
this(cubeDesc, null);
}
@@ -65,7 +60,6 @@ public class CubeJoinedFlatTableDesc implements IJoinedFlatTableDesc {
this.cubeDesc = cubeDesc;
this.cubeSegment = cubeSegment;
this.columnIndexMap = Maps.newHashMap();
- this.cubeJoins = new ArrayList<JoinDesc>(cubeDesc.getDimensions().size());
parseCubeDesc();
}
@@ -143,12 +137,6 @@ public class CubeJoinedFlatTableDesc implements IJoinedFlatTableDesc {
}
columnCount = columnIndex;
-
- for (DimensionDesc d : cubeDesc.getDimensions()) {
- if (d.getJoin() != null) {
- cubeJoins.add(d.getJoin());
- }
- }
}
// sanity check the input record (in bytes) matches what's expected
@@ -187,13 +175,8 @@ public class CubeJoinedFlatTableDesc implements IJoinedFlatTableDesc {
return cubeDesc.getModel();
}
- private static String colName(String canonicalColName) {
- return canonicalColName.replace(".", "_");
- }
-
public int getColumnIndex(TblColRef colRef) {
- String key = colName(colRef.getCanonicalName());
- Integer index = columnIndexMap.get(key);
+ Integer index = columnIndexMap.get(colRef);
if (index == null)
throw new IllegalArgumentException("Column " + colRef.toString() + " wasn't found on flat table.");