Filter out computed column for lookup tables for models
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ea92edf2 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ea92edf2 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ea92edf2 Branch: refs/heads/master Commit: ea92edf2cc23952292b18fb4b44a1b3dc32dd08a Parents: 58ca04e Author: nichunen <chunen...@kyligence.io> Authored: Fri Sep 15 14:54:07 2017 +0800 Committer: Hongbin Ma <m...@kyligence.io> Committed: Mon Sep 18 21:34:47 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/metadata/model/DataModelDesc.java | 4 ++-- .../main/java/org/apache/kylin/metadata/model/TableRef.java | 6 ++++-- .../main/java/org/apache/kylin/metadata/model/TblColRef.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ea92edf2/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 1897c0f..1a48558 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 @@ -421,7 +421,7 @@ public class DataModelDesc extends RootPersistentEntity { throw new IllegalStateException("Root fact table does not exist:" + rootFactTable); TableDesc rootDesc = tables.get(rootFactTable); - rootFactTableRef = new TableRef(this, rootDesc.getName(), rootDesc); + rootFactTableRef = new TableRef(this, rootDesc.getName(), rootDesc, false); addAlias(rootFactTableRef); factTableRefs.add(rootFactTableRef); @@ -440,7 +440,7 @@ public class DataModelDesc extends RootPersistentEntity { alias = alias.toUpperCase(); join.setAlias(alias); - TableRef ref = new TableRef(this, alias, tableDesc); + TableRef ref = new TableRef(this, alias, tableDesc, true); join.setTableRef(ref); addAlias(ref); http://git-wip-us.apache.org/repos/asf/kylin/blob/ea92edf2/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java index 5c2ebac..7428012 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/TableRef.java @@ -34,7 +34,7 @@ public class TableRef implements Serializable { final private Map<String, TblColRef> columns; final private String modelName; - TableRef(DataModelDesc model, String alias, TableDesc table) { + TableRef(DataModelDesc model, String alias, TableDesc table, boolean filterOutComputedColumns) { this.model = model; this.modelName = model.getName(); this.alias = alias; @@ -42,7 +42,9 @@ public class TableRef implements Serializable { this.columns = Maps.newLinkedHashMap(); for (ColumnDesc col : table.getColumns()) { - columns.put(col.getName(), new TblColRef(this, col)); + if (!filterOutComputedColumns || !col.isComputedColumnn()) { + columns.put(col.getName(), new TblColRef(this, col)); + } } } http://git-wip-us.apache.org/repos/asf/kylin/blob/ea92edf2/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 cc2dd03..8900754 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 @@ -75,7 +75,7 @@ public class TblColRef implements Serializable { } public static TableRef tableForUnknownModel(String tempTableAlias, TableDesc table) { - return new TableRef(UNKNOWN_MODEL, tempTableAlias, table); + return new TableRef(UNKNOWN_MODEL, tempTableAlias, table, false); } public static TblColRef columnForUnknownModel(TableRef table, ColumnDesc colDesc) {
