Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 29032200BC8 for ; Wed, 19 Oct 2016 05:05:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 25004160AF7; Wed, 19 Oct 2016 03:05:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E1B48160B1D for ; Wed, 19 Oct 2016 05:05:30 +0200 (CEST) Received: (qmail 91505 invoked by uid 500); 19 Oct 2016 03:05:23 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 90815 invoked by uid 99); 19 Oct 2016 03:05:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2016 03:05:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E7F6EF15A8; Wed, 19 Oct 2016 03:05:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lidong@apache.org To: commits@kylin.apache.org Date: Wed, 19 Oct 2016 03:05:44 -0000 Message-Id: <5f58d268e1d24b30ab312dbf3aec1e64@git.apache.org> In-Reply-To: <65d1f951e4ab48deb54ac7c216304572@git.apache.org> References: <65d1f951e4ab48deb54ac7c216304572@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] [abbrv] kylin git commit: KYLIN-2084 Unload sample table failed archived-at: Wed, 19 Oct 2016 03:05:33 -0000 KYLIN-2084 Unload sample table failed Signed-off-by: Jason Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ef44b7f6 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ef44b7f6 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ef44b7f6 Branch: refs/heads/master-cdh5.7 Commit: ef44b7f6873b2e5ac55243818877474cdc0376d8 Parents: c3bfd77 Author: Jason Authored: Mon Oct 17 13:18:57 2016 +0800 Committer: Jason Committed: Mon Oct 17 13:20:16 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/metadata/MetadataManager.java | 10 ++++++++++ .../org/apache/kylin/rest/controller/TableController.java | 3 +++ .../java/org/apache/kylin/rest/service/ModelService.java | 7 +++++++ 3 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ef44b7f6/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 92d41b9..e0c78ce 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 @@ -496,6 +496,16 @@ public class MetadataManager { return false; } + public List getModelsUsingTable(String tableName, String projectName) throws IOException { + List models = new ArrayList<>(); + for (DataModelDesc modelDesc : getModels(projectName)) { + if (modelDesc.getAllTables().contains(tableName.toUpperCase())) { + models.add(modelDesc.getName()); + } + } + return models; + } + public boolean isTableInAnyModel(String tableName) { for (DataModelDesc modelDesc : getModels()) { if (modelDesc.getAllTables().contains(tableName.toUpperCase())) { http://git-wip-us.apache.org/repos/asf/kylin/blob/ef44b7f6/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java index 34cc57f..d9050c1 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/TableController.java @@ -197,6 +197,9 @@ public class TableController extends BasicController { if (!modelService.isTableInModel(tableName, project)) { cubeMgmtService.removeTableFromProject(tableName, project); rtn = true; + }else{ + List models = modelService.getModelsUsingTable(tableName, project); + throw new InternalErrorException("Table is already in use by models "+models); } } catch (IOException e) { logger.error(e.getMessage(), e); http://git-wip-us.apache.org/repos/asf/kylin/blob/ef44b7f6/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 bfff619..2f8667c 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 @@ -132,4 +132,11 @@ public class ModelService extends BasicService { tableName = dbTableName[0] + "." + dbTableName[1]; return getMetadataManager().isTableInModel(tableName, projectName); } + + @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or hasPermission(#desc, 'ADMINISTRATION') or hasPermission(#desc, 'MANAGEMENT')") + public List getModelsUsingTable(String tableName, String projectName) throws IOException { + String[] dbTableName = HadoopUtil.parseHiveTableName(tableName); + tableName = dbTableName[0] + "." + dbTableName[1]; + return getMetadataManager().getModelsUsingTable(tableName, projectName); + } }