Merge commit 'ec2603ea46fbdb0e778d0257fa23e56fbe5aa762'
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/bf0e2e16 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/bf0e2e16 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/bf0e2e16 Branch: refs/heads/master Commit: bf0e2e16a88844488783a496b31f3e7dfff54b2c Parents: cfe5c44 ec2603e Author: Li Yang <liy...@apache.org> Authored: Mon Sep 18 09:41:19 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Mon Sep 18 09:41:19 2017 +0800 ---------------------------------------------------------------------- build/deploy/context.xml | 2 +- .../apache/kylin/common/KylinConfigBase.java | 27 ++++- .../kylin/common/restclient/RestClient.java | 10 +- .../main/resources/kylin-defaults.properties | 14 ++- .../kylin/common/restclient/RestClientTest.java | 19 +++- .../org/apache/kylin/cube/CubeInstance.java | 10 ++ .../java/org/apache/kylin/cube/CubeManager.java | 8 +- .../org/apache/kylin/cube/model/CubeDesc.java | 10 ++ .../org/apache/kylin/cube/CubeDescTest.java | 46 ++++++++ .../org/apache/kylin/cube/CubeManagerTest.java | 12 ++ .../kylin/metadata/cachesync/Broadcaster.java | 27 ++++- .../kylin/metadata/project/ProjectManager.java | 9 ++ .../realization/IRealizationConstants.java | 4 - .../storage/gtrecord/CubeScanRangePlanner.java | 4 +- .../engine/mr/common/AbstractHadoopJob.java | 9 +- .../kylin/engine/mr/common/BatchConstants.java | 1 + .../engine/mr/common/MapReduceExecutable.java | 102 +++++++++++++---- .../test_case_data/sandbox/kylin_job_conf.xml | 26 +++++ .../sandbox/kylin_job_conf_inmem.xml | 17 ++- .../kylin/query/security/TableLevelACL.java | 79 +++++++++++++ .../kylin/rest/controller/AccessController.java | 46 +++++++- .../rest/job/StorageCleanJobHbaseUtil.java | 7 +- .../kylin/rest/security/AclEntityType.java | 1 - .../kylin/rest/security/AclPermission.java | 2 - .../rest/security/ExternalAclProvider.java | 104 +++++++++++++++++ .../security/KylinAclPermissionEvaluator.java | 111 +++++++++++++++++++ .../apache/kylin/rest/service/QueryService.java | 1 - .../kylin/rest/util/AclPermissionUtil.java | 39 +++++++ server/src/main/resources/kylinSecurity.xml | 4 +- .../kylin/rest/service/CacheServiceTest.java | 4 + .../storage/hbase/cube/v2/CubeHBaseRPC.java | 6 +- .../kylin/storage/hbase/util/HBaseClean.java | 5 +- .../kylin/storage/hbase/util/HBaseUsage.java | 5 +- .../storage/hbase/util/OrphanHBaseCleanJob.java | 5 +- .../storage/hbase/util/StorageCleanupJob.java | 9 +- webapp/app/js/services/kylinProperties.js | 8 ++ webapp/app/partials/cubes/cube_detail.html | 3 +- .../app/partials/projects/project_detail.html | 3 +- 38 files changed, 715 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/core-common/src/main/resources/kylin-defaults.properties ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java ---------------------------------------------------------------------- diff --cc engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java index 292c57d,babf69b..babf69b mode 100644,100755..100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/AbstractHadoopJob.java http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java ---------------------------------------------------------------------- diff --cc server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java index 014df68,cd39cb1..b3c9458 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/AccessController.java @@@ -22,15 -23,18 +23,21 @@@ import java.util.ArrayList import java.util.List; import org.apache.kylin.common.persistence.AclEntity; + import org.apache.kylin.common.util.Pair; import org.apache.kylin.rest.request.AccessRequest; import org.apache.kylin.rest.response.AccessEntryResponse; +import org.apache.kylin.rest.security.AclEntityType; + import org.apache.kylin.rest.security.AclPermission; import org.apache.kylin.rest.security.AclPermissionFactory; + import org.apache.kylin.rest.security.ExternalAclProvider; import org.apache.kylin.rest.service.AccessService; +import org.apache.kylin.rest.service.ProjectService; +import org.apache.kylin.rest.service.TableACLService; + import org.apache.kylin.rest.service.UserService; + import org.apache.kylin.rest.util.AclPermissionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; + import org.springframework.security.acls.domain.PrincipalSid; import org.springframework.security.acls.model.Acl; import org.springframework.security.acls.model.Permission; import org.springframework.security.acls.model.Sid; @@@ -54,13 -59,9 +62,17 @@@ public class AccessController extends B private AccessService accessService; @Autowired + @Qualifier("projectService") + private ProjectService projectService; + + @Autowired + @Qualifier("TableAclService") + private TableACLService tableACLService; + ++ @Autowired + @Qualifier("userService") + private UserService userService; + /** * Get access entry list of a domain object * http://git-wip-us.apache.org/repos/asf/kylin/blob/bf0e2e16/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java ---------------------------------------------------------------------- diff --cc server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java index 088ed6d,2cbe516..8a3e6b3 --- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java +++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java @@@ -959,7 -938,7 +959,6 @@@ public class QueryService extends Basic * @param param * @throws SQLException */ -- @SuppressWarnings("unused") private void setParam(PreparedStatement preparedState, int index, PrepareSqlRequest.StateParam param) throws SQLException { boolean isNull = (null == param.getValue());
