minor fix check if table using by model
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8d9d62b0 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8d9d62b0 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8d9d62b0 Branch: refs/heads/yang22-hbase1.x Commit: 8d9d62b08e6a69c7552a17915a7aa4a1687b0b3d Parents: ab6aecd Author: Billy Liu <billy...@apache.org> Authored: Fri Dec 30 11:01:58 2016 +0800 Committer: Billy Liu <billy...@apache.org> Committed: Fri Dec 30 11:01:58 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/metadata/MetadataManager.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8d9d62b0/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 772e5d6..7290d4c 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 @@ -39,6 +39,7 @@ import org.apache.kylin.metadata.model.DataModelDesc; import org.apache.kylin.metadata.model.ExternalFilterDesc; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TableExtDesc; +import org.apache.kylin.metadata.model.TableRef; import org.apache.kylin.metadata.project.ProjectInstance; import org.apache.kylin.metadata.project.ProjectManager; import org.slf4j.Logger; @@ -496,19 +497,16 @@ public class MetadataManager { } public boolean isTableInModel(String tableName, String projectName) throws IOException { - for (DataModelDesc modelDesc : getModels(projectName)) { - if (modelDesc.getAllTables().contains(tableName.toUpperCase())) { - return true; - } - } - return false; + return getModelsUsingTable(tableName, projectName).size() > 0; } public List<String> getModelsUsingTable(String tableName, String projectName) throws IOException { List<String> models = new ArrayList<>(); for (DataModelDesc modelDesc : getModels(projectName)) { - if (modelDesc.getAllTables().contains(tableName.toUpperCase())) { - models.add(modelDesc.getName()); + for(TableRef tableRef : modelDesc.getAllTables()){ + if(tableRef.getTableName().equalsIgnoreCase(tableName)){ + models.add(modelDesc.getName()); + } } } return models; @@ -516,8 +514,10 @@ public class MetadataManager { public boolean isTableInAnyModel(String tableName) { for (DataModelDesc modelDesc : getModels()) { - if (modelDesc.getAllTables().contains(tableName.toUpperCase())) { - return true; + for(TableRef tableRef : modelDesc.getAllTables()){ + if(tableRef.getTableName().equalsIgnoreCase(tableName)){ + return true; + } } } return false;