This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch 2.6.x in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 4a1184ed33dac9700f8b2e3cfd332908b41a7504 Author: Kang <[email protected]> AuthorDate: Mon Oct 28 20:24:28 2019 +0800 KYLIN-4169 remove useless listModels() in DataModelManager.curd.initE… (#843) * KYLIN-4169 remove useless listModels() in DataModelManager.curd.initEntityAfterReload * remove useless parameters --- .../java/org/apache/kylin/metadata/model/DataModelDesc.java | 10 ++++------ .../java/org/apache/kylin/metadata/model/DataModelManager.java | 4 ++-- .../main/java/org/apache/kylin/rest/service/ModelService.java | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) 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 f46bff4..5795d78 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 @@ -342,13 +342,11 @@ public class DataModelDesc extends RootPersistentEntity { /** * @param isOnlineModel will affect the exposed view of project specific tables */ - public void init(KylinConfig config, Map<String, TableDesc> tables, List<DataModelDesc> otherModels, - boolean isOnlineModel) { - initInternal(config, tables, otherModels, isOnlineModel); + public void init(KylinConfig config, Map<String, TableDesc> tables) { + initInternal(config, tables); } - public void initInternal(KylinConfig config, Map<String, TableDesc> tables, List<DataModelDesc> otherModels, - boolean isOnlineModel) { + public void initInternal(KylinConfig config, Map<String, TableDesc> tables) { this.config = config; initJoinTablesForUpgrade(); @@ -362,7 +360,7 @@ public class DataModelDesc extends RootPersistentEntity { boolean reinit = validate(); if (reinit) { // model slightly changed by validate() and must init() again - initInternal(config, tables, otherModels, isOnlineModel); + initInternal(config, tables); } } diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelManager.java index c1ffbf7..88ba93d 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelManager.java @@ -88,7 +88,7 @@ public class DataModelManager { protected DataModelDesc initEntityAfterReload(DataModelDesc model, String resourceName) { String prj = ProjectManager.getInstance(config).getProjectOfModel(model.getName()).getName(); if (!model.isDraft()) { - model.init(config, getAllTablesMap(prj), getModels(prj), true); + model.init(config, getAllTablesMap(prj)); } return model; } @@ -275,7 +275,7 @@ public class DataModelManager { String prj = ProjectManager.getInstance(config).getProjectOfModel(dataModelDesc.getName()).getName(); if (!dataModelDesc.isDraft()) - dataModelDesc.init(config, this.getAllTablesMap(prj), getModels(prj), false); + dataModelDesc.init(config, this.getAllTablesMap(prj)); crud.save(dataModelDesc); diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java b/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java index f3281e2..a385fab 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java @@ -286,8 +286,7 @@ public class ModelService extends BasicService { StringBuilder checkRet = new StringBuilder(); if (cubes != null && cubes.size() != 0 && !historyModels.isEmpty()) { - dataModelDesc.init(getConfig(), getTableManager().getAllTablesMap(project), - getDataModelManager().getModels(project), false); + dataModelDesc.init(getConfig(), getTableManager().getAllTablesMap(project)); List<String> curModelDims = getModelCols(dataModelDesc); List<String> curModelMeasures = getModelMeasures(dataModelDesc);
