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/09/07 09:22:34 UTC
incubator-kylin git commit: bug fix for ci
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 7797c2bfb -> 9f4b93b94
bug fix for ci
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9f4b93b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9f4b93b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9f4b93b9
Branch: refs/heads/0.8
Commit: 9f4b93b949d93bcb1ca0e4afd22e36d4016ccae3
Parents: 7797c2b
Author: honma <ho...@ebay.com>
Authored: Mon Sep 7 14:38:56 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Mon Sep 7 14:38:56 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/model/DataModelDesc.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9f4b93b9/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
index 1c6ef62..66581c0 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
@@ -104,7 +104,7 @@ public class DataModelDesc extends RootPersistentEntity {
public String getFactTable() {
return factTable;
}
-
+
public TableDesc getFactTableDesc() {
return factTableDesc;
}
@@ -175,6 +175,7 @@ public class DataModelDesc extends RootPersistentEntity {
}
public void init(Map<String, TableDesc> tables) {
+ this.factTable = this.factTable.toUpperCase();
this.factTableDesc = tables.get(this.factTable.toUpperCase());
if (factTableDesc == null) {
throw new IllegalStateException("Fact table does not exist:" + this.factTable);
@@ -207,7 +208,7 @@ public class DataModelDesc extends RootPersistentEntity {
StringUtil.toUpperCaseArray(join.getForeignKey(), join.getForeignKey());
StringUtil.toUpperCaseArray(join.getPrimaryKey(), join.getPrimaryKey());
-
+
// primary key
String[] pks = join.getPrimaryKey();
TblColRef[] pkCols = new TblColRef[pks.length];
@@ -221,7 +222,7 @@ public class DataModelDesc extends RootPersistentEntity {
pkCols[i] = colRef;
}
join.setPrimaryKeyColumns(pkCols);
-
+
// foreign key
String[] fks = join.getForeignKey();
TblColRef[] fkCols = new TblColRef[fks.length];
@@ -235,7 +236,7 @@ public class DataModelDesc extends RootPersistentEntity {
fkCols[i] = colRef;
}
join.setForeignKeyColumns(fkCols);
-
+
// Validate join in dimension
if (pkCols.length != fkCols.length) {
throw new IllegalStateException("Primary keys(" + lookup.getTable() + ")" + Arrays.toString(pks) + " are not consistent with Foreign keys(" + this.getFactTable() + ") " + Arrays.toString(fks));