From b2bca9518e773facf86030b370a19b758fb710cb Mon Sep 17 00:00:00 2001 From: kangkaisen Date: Tue, 19 Dec 2017 12:26:47 +0800 Subject: [PATCH] KYLIN-3117 Hide project configs in cube level --- core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 5ff52c1a1..c4e1cede4 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 ownerPrj = ProjectManager.getInstance(config).findProjects(RealizationType.CUBE, name); // cube inherit the project override props + LinkedHashMap allOverrideProps = Maps.newLinkedHashMap(overrideKylinProps); + if (ownerPrj.size() == 1) { Map prjOverrideProps = ownerPrj.get(0).getOverrideKylinProps(); for (Entry 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", -- 2.14.3 (Apple Git-98)