You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/01/19 02:58:31 UTC
[1/2] kylin git commit: KYLIN-1219 fix conflict url pattern in
kylinSecurity.xml configuration
Repository: kylin
Updated Branches:
refs/heads/2.x-staging 7b210fc41 -> 573c84e61
KYLIN-1219 fix conflict url pattern in kylinSecurity.xml configuration
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4c2e57ed
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4c2e57ed
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4c2e57ed
Branch: refs/heads/2.x-staging
Commit: 4c2e57edc50eb0b71881ada5d1ebc5c81e8e3657
Parents: 7b210fc
Author: shaofengshi <sh...@apache.org>
Authored: Tue Jan 19 09:50:19 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Jan 19 09:57:35 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/rest/service/AdminService.java | 1 +
server/src/main/resources/kylinSecurity.xml | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/4c2e57ed/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/AdminService.java b/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
index 0541ba3..1a9ae95 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
@@ -96,6 +96,7 @@ public class AdminService extends BasicService {
}
}
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
public void cleanupStorage() {
StorageCleanupJob job = new StorageCleanupJob();
String[] args = new String[] { "-delete", "true" };
http://git-wip-us.apache.org/repos/asf/kylin/blob/4c2e57ed/server/src/main/resources/kylinSecurity.xml
----------------------------------------------------------------------
diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml
index f9884c7..4a9b929 100644
--- a/server/src/main/resources/kylinSecurity.xml
+++ b/server/src/main/resources/kylinSecurity.xml
@@ -176,9 +176,6 @@
<scr:http security="none" pattern="/js/**"/>
<scr:http security="none" pattern="/login/**"/>
<scr:http security="none" pattern="/routes.json"/>
- <scr:http security="none" pattern="/api/projects" />
- <scr:http security="none" pattern="/api/admin/config" />
- <scr:http security="none" pattern="/api/admin/env" />
<!-- Secured Rest API urls with LDAP basic authentication -->
<scr:http pattern="/api/**" use-expressions="true" authentication-manager-ref="apiAccessAuthenticationManager">
[2/2] kylin git commit: KYLIN-1328 "UnsupportedOperationException" is
thrown when remove a data model
Posted by sh...@apache.org.
KYLIN-1328 "UnsupportedOperationException" is thrown when remove a data model
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/573c84e6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/573c84e6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/573c84e6
Branch: refs/heads/2.x-staging
Commit: 573c84e612bc59f2da656d58475a708b2505cc6e
Parents: 4c2e57e
Author: shaofengshi <sh...@apache.org>
Authored: Tue Jan 19 09:54:51 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Jan 19 09:57:44 2016 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/metadata/MetadataManager.java | 6 +++---
.../main/java/org/apache/kylin/rest/service/CacheService.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/573c84e6/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 d2caa35..80ee8b3 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
@@ -385,11 +385,11 @@ public class MetadataManager {
}
private void afterModelDropped(DataModelDesc desc) {
- removeModelCache(desc);
+ removeModelCache(desc.getName());
}
- private void removeModelCache(DataModelDesc desc) {
- dataModelDescMap.remove(desc.getName());
+ public void removeModelCache(String modelName) {
+ dataModelDescMap.remove(modelName);
}
public DataModelDesc createDataModelDesc(DataModelDesc desc, String projectName, String owner) throws IOException {
http://git-wip-us.apache.org/repos/asf/kylin/blob/573c84e6/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/CacheService.java b/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
index c8bc941..27650b2 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
@@ -261,7 +261,7 @@ public class CacheService extends BasicService {
case TABLE:
throw new UnsupportedOperationException(log);
case DATA_MODEL:
- throw new UnsupportedOperationException(log);
+ getMetadataManager().removeModelCache(cacheKey);
default:
throw new RuntimeException("invalid cacheType:" + cacheType);
}