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/01/31 13:01:48 UTC

[21/50] incubator-kylin git commit: half way, has to commit for another push

half way, has to commit for another push


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

Branch: refs/heads/inverted-index
Commit: a849fc2b1f3aef1df991074c93ad744ab469300e
Parents: bbac511
Author: Li, Yang <ya...@ebay.com>
Authored: Wed Jan 28 17:16:55 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Wed Jan 28 17:16:55 2015 +0800

----------------------------------------------------------------------
 cube/src/main/java/com/kylinolap/cube/model/CubeDesc.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a849fc2b/cube/src/main/java/com/kylinolap/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/model/CubeDesc.java b/cube/src/main/java/com/kylinolap/cube/model/CubeDesc.java
index 219b167..86b4981 100644
--- a/cube/src/main/java/com/kylinolap/cube/model/CubeDesc.java
+++ b/cube/src/main/java/com/kylinolap/cube/model/CubeDesc.java
@@ -494,7 +494,6 @@ public class CubeDesc extends RootPersistentEntity {
 
     private void initDimensionColumns(Map<String, TableDesc> tables) {
         for (DimensionDesc dim : dimensions) {
-            TableDesc dimTable = dim.getTableDesc();
             JoinDesc join = dim.getJoin();
 
             // init dimension columns
@@ -513,7 +512,7 @@ public class CubeDesc extends RootPersistentEntity {
                     throw new IllegalStateException("Dimension column must not be blank " + dim);
                 
                 for (String colStr : colStrs) {
-                    dimCols.add(initDimensionColRef(dimTable, colStr));
+                    dimCols.add(initDimensionColRef(dim, colStr));
                 }
                 
                 // fill back column ref in hierarchy
@@ -535,7 +534,7 @@ public class CubeDesc extends RootPersistentEntity {
                 String[] derivedExtra = split[1];
                 TblColRef[] derivedCols = new TblColRef[derivedNames.length];
                 for (int i = 0; i < derivedNames.length; i++) {
-                    derivedCols[i] = initDimensionColRef(dimTable, derivedNames[i]);
+                    derivedCols[i] = initDimensionColRef(dim, derivedNames[i]);
                 }
                 initDerivedMap(hostCols, DeriveType.LOOKUP, dim, derivedCols, derivedExtra);
             }
@@ -601,10 +600,13 @@ public class CubeDesc extends RootPersistentEntity {
         }
     }
 
-    private TblColRef initDimensionColRef(TableDesc table, String colName) {
+    private TblColRef initDimensionColRef(DimensionDesc dim, String colName) {
+        TableDesc table = dim.getTableDesc();
         ColumnDesc col = table.findColumnByName(colName);
         if (col == null)
             throw new IllegalArgumentException("No column '" + colName + "' found in table " + table);
+        
+        // always use FK instead PK, FK could be shared to join more than one lookup tables
 
         TblColRef ref = new TblColRef(col);
         return initDimensionColRef(ref);