minor, make that project management can not load/unload tables.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8f3f459e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8f3f459e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8f3f459e Branch: refs/heads/master Commit: 8f3f459e35728b9238c36e868164be123b102d69 Parents: ea92edf Author: tttMelody <245915...@qq.com> Authored: Tue Sep 19 21:01:34 2017 +0800 Committer: Hongbin Ma <m...@kyligence.io> Committed: Tue Sep 19 21:21:12 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/rest/service/KafkaConfigService.java | 6 +++--- .../org/apache/kylin/rest/service/StreamingService.java | 6 +++--- .../java/org/apache/kylin/rest/service/TableService.java | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8f3f459e/server-base/src/main/java/org/apache/kylin/rest/service/KafkaConfigService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/KafkaConfigService.java b/server-base/src/main/java/org/apache/kylin/rest/service/KafkaConfigService.java index 3983a30..260cbc0 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/KafkaConfigService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/KafkaConfigService.java @@ -69,7 +69,7 @@ public class KafkaConfigService extends BasicService { } public KafkaConfig createKafkaConfig(KafkaConfig config, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); Message msg = MsgPicker.getMsg(); if (getKafkaManager().getKafkaConfig(config.getName()) != null) { @@ -80,7 +80,7 @@ public class KafkaConfigService extends BasicService { } public KafkaConfig updateKafkaConfig(KafkaConfig config, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); return getKafkaManager().updateKafkaConfig(config); } @@ -90,7 +90,7 @@ public class KafkaConfigService extends BasicService { } public void dropKafkaConfig(KafkaConfig config, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); getKafkaManager().removeKafkaConfig(config); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/8f3f459e/server-base/src/main/java/org/apache/kylin/rest/service/StreamingService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/StreamingService.java b/server-base/src/main/java/org/apache/kylin/rest/service/StreamingService.java index 2871285..1f907f8 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/StreamingService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/StreamingService.java @@ -67,7 +67,7 @@ public class StreamingService extends BasicService { } public StreamingConfig createStreamingConfig(StreamingConfig config, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); Message msg = MsgPicker.getMsg(); if (getStreamingManager().getStreamingConfig(config.getName()) != null) { @@ -78,12 +78,12 @@ public class StreamingService extends BasicService { } public StreamingConfig updateStreamingConfig(StreamingConfig config, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); return getStreamingManager().updateStreamingConfig(config); } public void dropStreamingConfig(StreamingConfig config, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); getStreamingManager().removeStreamingConfig(config); } http://git-wip-us.apache.org/repos/asf/kylin/blob/8f3f459e/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java index 4680c47..a7c851c 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java @@ -114,7 +114,7 @@ public class TableService extends BasicService { } public String[] loadHiveTablesToProject(String[] tables, String project) throws Exception { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); // de-dup SetMultimap<String, String> db2tables = LinkedHashMultimap.create(); for (String fullTableName : tables) { @@ -182,7 +182,7 @@ public class TableService extends BasicService { } public Map<String, String[]> loadHiveTables(String[] tableNames, String project, boolean isNeedProfile) throws Exception { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); String submitter = SecurityContextHolder.getContext().getAuthentication().getName(); Map<String, String[]> result = new HashMap<String, String[]>(); @@ -205,7 +205,7 @@ public class TableService extends BasicService { } public Map<String, String[]> unloadHiveTables(String[] tableNames, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); Set<String> unLoadSuccess = Sets.newHashSet(); Set<String> unLoadFail = Sets.newHashSet(); Map<String, String[]> result = new HashMap<String, String[]>(); @@ -240,7 +240,7 @@ public class TableService extends BasicService { * @return */ public boolean unloadHiveTable(String tableName, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); Message msg = MsgPicker.getMsg(); boolean rtn = false; @@ -295,7 +295,7 @@ public class TableService extends BasicService { * @throws IOException */ public void addStreamingTable(TableDesc desc, String project) throws IOException { - aclEvaluate.checkProjectWritePermission(project); + aclEvaluate.checkProjectAdminPermission(project); desc.setUuid(UUID.randomUUID().toString()); getMetadataManager().saveSourceTable(desc, project); syncTableToProject(new String[] { desc.getIdentity() }, project);
