Repository: kylin Updated Branches: refs/heads/KYLIN-1971 3c94f5644 -> 5793c19f4
fix test Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5793c19f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5793c19f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5793c19f Branch: refs/heads/KYLIN-1971 Commit: 5793c19f40379af499100f377b2f12469a672acc Parents: 3c94f56 Author: Li Yang <liy...@apache.org> Authored: Mon Oct 24 15:29:33 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Mon Oct 24 15:29:33 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/metadata/model/TblColRef.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/5793c19f/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java index 04a5b9c..69569dd 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TblColRef.java @@ -193,10 +193,12 @@ public class TblColRef implements Serializable { @Override public String toString() { String alias = table == null ? "UNKNOWN_MODEL" : table.getAlias(); - if (alias.equals(column.getTable().getName())) { - return column.getTable().getIdentity() + "." + column.getName(); + String tableName = column.getTable() == null ? "NULL" : column.getTable().getName(); + String tableIdentity = column.getTable() == null ? "NULL" : column.getTable().getIdentity(); + if (alias.equals(tableName)) { + return tableIdentity + "." + column.getName(); } else { - return alias + ":" + column.getTable().getIdentity() + "." + column.getName(); + return alias + ":" + tableIdentity + "." + column.getName(); } } }
