KYLIN-1860 "Models" view is slow to show up Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9200475c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9200475c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9200475c
Branch: refs/heads/1.5.x-CDH5.7 Commit: 9200475c472ff7363698186105f7002f1d5d09b1 Parents: 743c9f8 Author: shaofengshi <shaofeng...@apache.org> Authored: Mon Jul 18 16:40:12 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Mon Jul 18 16:40:12 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/metadata/MetadataManager.java | 17 +---------------- .../apache/kylin/rest/service/ModelService.java | 8 +++----- 2 files changed, 4 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/9200475c/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java index 45acd42..f4fbcd0 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java @@ -368,7 +368,7 @@ public class MetadataManager { } public List<DataModelDesc> getModels() { - return new ArrayList<DataModelDesc>(dataModelDescMap.values()); + return new ArrayList<>(dataModelDescMap.values()); } public List<DataModelDesc> getModels(String projectName) throws IOException { @@ -386,21 +386,6 @@ public class MetadataManager { } } - //TODO, list model from realization,compatible with old meta data,will remove - RealizationRegistry registry = RealizationRegistry.getInstance(config); - for (RealizationEntry realization : projectInstance.getRealizationEntries()) { - IRealization rel = registry.getRealization(realization.getType(), realization.getRealization()); - if (rel != null) { - DataModelDesc modelDesc = rel.getDataModelDesc(); - if (modelDesc != null && !ret.contains(modelDesc)) { - ProjectManager.getInstance(config).updateModelToProject(modelDesc.getName(), projectName); - ret.add(modelDesc); - } - } else { - logger.warn("Realization '" + realization + "' defined under project '" + projectInstance + "' is not found"); - } - } - return new ArrayList<>(ret); } http://git-wip-us.apache.org/repos/asf/kylin/blob/9200475c/server-base/src/main/java/org/apache/kylin/rest/service/ModelService.java ---------------------------------------------------------------------- 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 4cfa209..bfff619 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 @@ -46,19 +46,18 @@ public class ModelService extends BasicService { @PostFilter(Constant.ACCESS_POST_FILTER_READ) public List<DataModelDesc> listAllModels(final String modelName, final String projectName) throws IOException { - List<DataModelDesc> models = null; + List<DataModelDesc> models; ProjectInstance project = (null != projectName) ? getProjectManager().getProject(projectName) : null; if (null == project) { models = getMetadataManager().getModels(); } else { models = getMetadataManager().getModels(projectName); - project.getModels(); } List<DataModelDesc> filterModels = new ArrayList<DataModelDesc>(); for (DataModelDesc modelDesc : models) { - boolean isModelMatch = (null == modelName) || modelDesc.getName().toLowerCase().contains(modelName.toLowerCase()); + boolean isModelMatch = (null == modelName) || modelName.length() == 0 || modelDesc.getName().toLowerCase().equals(modelName.toLowerCase()); if (isModelMatch) { filterModels.add(modelDesc); @@ -70,8 +69,7 @@ public class ModelService extends BasicService { public List<DataModelDesc> getModels(final String modelName, final String projectName, final Integer limit, final Integer offset) throws IOException { - List<DataModelDesc> modelDescs; - modelDescs = listAllModels(modelName, projectName); + List<DataModelDesc> modelDescs = listAllModels(modelName, projectName); if (limit == null || offset == null) { return modelDescs;
