Repository: kylin Updated Branches: refs/heads/yang-m1 143dfb5a7 -> 1e8b44f3f
minor bug fix in project L2 cache rebuilding Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1e8b44f3 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1e8b44f3 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1e8b44f3 Branch: refs/heads/yang-m1 Commit: 1e8b44f3ff83c457f51732bd9579a0d1638a67da Parents: 143dfb5 Author: Hongbin Ma <mahong...@apache.org> Authored: Fri Apr 8 11:27:20 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Fri Apr 8 13:30:24 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/metadata/MetadataManager.java | 4 ++++ .../apache/kylin/rest/controller/ExternalFilterController.java | 1 + .../main/java/org/apache/kylin/rest/service/CacheService.java | 2 +- .../java/org/apache/kylin/rest/service/ExtFilterService.java | 2 -- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/1e8b44f3/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 928baad..9ed1f13 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 @@ -351,6 +351,10 @@ public class MetadataManager { return t; } + public void reloadExtFilter(String extFilterName) throws IOException { + reloadExternalFilterAt(ExternalFilterDesc.concatResourcePath(extFilterName)); + } + public void reloadSourceTableExt(String tableIdentity) throws IOException { reloadSourceTableExdAt(TableDesc.concatExdResourcePath(tableIdentity)); } http://git-wip-us.apache.org/repos/asf/kylin/blob/1e8b44f3/server/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java b/server/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java index cc56059..0d41847 100644 --- a/server/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java +++ b/server/src/main/java/org/apache/kylin/rest/controller/ExternalFilterController.java @@ -71,6 +71,7 @@ public class ExternalFilterController extends BasicController { Map<String, String> result = new HashMap(); ExternalFilterDesc desc = JsonUtil.readValue(request.getExtFilter(), ExternalFilterDesc.class); extFilterService.updateExternalFilter(desc); + extFilterService.syncExtFilterToProject(new String[] { desc.getName() }, request.getProject()); result.put("success", "true"); return result; } http://git-wip-us.apache.org/repos/asf/kylin/blob/1e8b44f3/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 4ec2116..48afde6 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 @@ -201,7 +201,7 @@ public class CacheService extends BasicService { CubeDescManager.clearCache(); break; case EXTERNAL_FILTER: - getMetadataManager().reloadTableCache(cacheKey); + getMetadataManager().reloadExtFilter(cacheKey); IIDescManager.clearCache(); CubeDescManager.clearCache(); break; http://git-wip-us.apache.org/repos/asf/kylin/blob/1e8b44f3/server/src/main/java/org/apache/kylin/rest/service/ExtFilterService.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/service/ExtFilterService.java b/server/src/main/java/org/apache/kylin/rest/service/ExtFilterService.java index 7e72d9a..576ece9 100644 --- a/server/src/main/java/org/apache/kylin/rest/service/ExtFilterService.java +++ b/server/src/main/java/org/apache/kylin/rest/service/ExtFilterService.java @@ -62,8 +62,6 @@ public class ExtFilterService extends BasicService { getMetadataManager().removeExternalFilter(name); } - - @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN) public void syncExtFilterToProject(String[] filters, String project) throws IOException { getProjectManager().addExtFilterToProject(filters, project);