Repository: kylin Updated Branches: refs/heads/master 018605d64 -> 1d1627a9a
KYLIN-3117 Hide project configs in cube level Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1d1627a9 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1d1627a9 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1d1627a9 Branch: refs/heads/master Commit: 1d1627a9a49b31c0ff96f6c9bc313587e52601c7 Parents: 018605d Author: kangkaisen <kangkai...@meituan.com> Authored: Tue Dec 19 12:26:47 2017 +0800 Committer: kangkaisen <kangkai...@meituan.com> Committed: Fri Dec 22 18:43:00 2017 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/cube/model/CubeDesc.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/1d1627a9/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java index 5ff52c1..c4e1ced 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java @@ -596,16 +596,18 @@ public class CubeDesc extends RootPersistentEntity implements IEngineAware { List<ProjectInstance> ownerPrj = ProjectManager.getInstance(config).findProjects(RealizationType.CUBE, name); // cube inherit the project override props + LinkedHashMap<String, String> allOverrideProps = Maps.newLinkedHashMap(overrideKylinProps); + if (ownerPrj.size() == 1) { Map<String, String> prjOverrideProps = ownerPrj.get(0).getOverrideKylinProps(); for (Entry<String, String> entry : prjOverrideProps.entrySet()) { if (!overrideKylinProps.containsKey(entry.getKey())) { - overrideKylinProps.put(entry.getKey(), entry.getValue()); + allOverrideProps.put(entry.getKey(), entry.getValue()); } } } - this.config = KylinConfigExt.createInstance(config, overrideKylinProps); + this.config = KylinConfigExt.createInstance(config, allOverrideProps); checkArgument(this.rowkey.getRowKeyColumns().length <= this.config.getCubeRowkeyMaxSize(), "Too many rowkeys (%s) in CubeDesc, please try to reduce dimension number or adopt derived dimensions",
