minor, fix acl migrate tool
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4f4382df Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4f4382df Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4f4382df Branch: refs/heads/kylin-2.1.x Commit: 4f4382df90ddd04a963dda36bcc1093c4b5d77b4 Parents: 7002dd8 Author: Roger Shi <rogershijich...@hotmail.com> Authored: Fri Jun 30 23:40:42 2017 +0800 Committer: liyang-gmt8 <liy...@apache.org> Committed: Fri Jun 30 23:45:52 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/rest/service/AclTableMigrationTool.java | 4 ++-- .../src/main/java/org/apache/kylin/rest/service/CubeService.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/4f4382df/server-base/src/main/java/org/apache/kylin/rest/service/AclTableMigrationTool.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/AclTableMigrationTool.java b/server-base/src/main/java/org/apache/kylin/rest/service/AclTableMigrationTool.java index 029efdc..bb07c22 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/AclTableMigrationTool.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/AclTableMigrationTool.java @@ -224,8 +224,8 @@ public class AclTableMigrationTool { Map<String, AceInfo> allAceInfoMap = new HashMap<>(); NavigableMap<byte[], byte[]> familyMap = result.getFamilyMap(Bytes.toBytes(AclConstant.ACL_ACES_FAMILY)); for (Map.Entry<byte[], byte[]> entry : familyMap.entrySet()) { - String sid = String.valueOf(entry.getKey()); - AceInfo aceInfo = aceSerializer.deserialize(familyMap.get(entry.getValue())); + String sid = new String(entry.getKey()); + AceInfo aceInfo = aceSerializer.deserialize(entry.getValue()); if (null != aceInfo) { allAceInfoMap.put(sid, aceInfo); } http://git-wip-us.apache.org/repos/asf/kylin/blob/4f4382df/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java index b2e44f6..aa42cb0 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java @@ -659,8 +659,6 @@ public class CubeService extends BasicService { getDraftManager().save(draft); } - @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN - + " or hasPermission(#draft, 'ADMINISTRATION') or hasPermission(#draft, 'MANAGEMENT')") public void deleteDraft(Draft draft) throws IOException { getDraftManager().delete(draft.getUuid()); }
