Return-Path: X-Original-To: apmail-kylin-commits-archive@minotaur.apache.org Delivered-To: apmail-kylin-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B755918E5B for ; Mon, 27 Jul 2015 09:21:54 +0000 (UTC) Received: (qmail 86029 invoked by uid 500); 27 Jul 2015 09:21:48 -0000 Delivered-To: apmail-kylin-commits-archive@kylin.apache.org Received: (qmail 85993 invoked by uid 500); 27 Jul 2015 09:21:48 -0000 Mailing-List: contact commits-help@kylin.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.incubator.apache.org Delivered-To: mailing list commits@kylin.incubator.apache.org Received: (qmail 85980 invoked by uid 99); 27 Jul 2015 09:21:48 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 09:21:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id F3F88D7E47 for ; Mon, 27 Jul 2015 09:21:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.491 X-Spam-Level: X-Spam-Status: No, score=0.491 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.289] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 8jg5zzYt6lsS for ; Mon, 27 Jul 2015 09:21:47 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 432F333505 for ; Mon, 27 Jul 2015 09:21:08 +0000 (UTC) Received: (qmail 83371 invoked by uid 99); 27 Jul 2015 09:21:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 09:21:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 56C0CDFF6C; Mon, 27 Jul 2015 09:21:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: qhzhou@apache.org To: commits@kylin.incubator.apache.org Date: Mon, 27 Jul 2015 09:21:52 -0000 Message-Id: In-Reply-To: <89059f14982741ae88c38f759e445e44@git.apache.org> References: <89059f14982741ae88c38f759e445e44@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B50/52=5D_=5Babbrv=5D_incubator-kylin_git_commit=3A_KY?= =?utf-8?q?LIN-797_merge_steven_zhang=E2=80=99s_change_in_0=2E8_and_organize?= =?utf-8?q?_the_CacheService=2Ejava?= KYLIN-797 merge steven zhang’s change in 0.8 and organize the CacheService.java Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/3d04704e Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/3d04704e Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/3d04704e Branch: refs/heads/0.8 Commit: 3d04704e8999855f2a2bad6778ba525d516c82af Parents: b02c2e6 Author: shaofengshi Authored: Mon Jul 27 13:36:34 2015 +0800 Committer: shaofengshi Committed: Mon Jul 27 13:36:34 2015 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/common/util/AbstractKylinTestCase.java | 1 - .../src/main/java/org/apache/kylin/cube/CubeDescManager.java | 4 ++++ .../main/java/org/apache/kylin/rest/service/CacheService.java | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3d04704e/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java ---------------------------------------------------------------------- diff --git a/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java b/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java index b47816b..c9e785a 100644 --- a/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java +++ b/core-common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java @@ -39,7 +39,6 @@ public abstract class AbstractKylinTestCase { public static final String[] SERVICES_WITH_CACHE = {// "org.apache.kylin.cube.CubeManager",// "org.apache.kylin.cube.CubeDescManager", // - "org.apache.kylin.cube.cuboid.Cuboid", // "org.apache.kylin.invertedindex.IIDescManager",// "org.apache.kylin.invertedindex.IIManager",// "org.apache.kylin.storage.hybrid.HybridManager", http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3d04704e/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java index d406da1..08ec53f 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java @@ -25,6 +25,7 @@ import org.apache.kylin.common.persistence.ResourceStore; import org.apache.kylin.common.persistence.Serializer; import org.apache.kylin.common.restclient.Broadcaster; import org.apache.kylin.common.restclient.CaseInsensitiveStringCache; +import org.apache.kylin.cube.cuboid.Cuboid; import org.apache.kylin.cube.model.CubeDesc; import org.apache.kylin.cube.model.validation.CubeMetadataValidator; import org.apache.kylin.cube.model.validation.ValidateContext; @@ -117,6 +118,7 @@ public class CubeDescManager { // Here replace the old one cubeDescMap.putLocal(ndesc.getName(), ndesc); + Cuboid.reloadCache(name); return ndesc; } @@ -180,11 +182,13 @@ public class CubeDescManager { String path = cubeDesc.getResourcePath(); getStore().deleteResource(path); cubeDescMap.remove(cubeDesc.getName()); + Cuboid.reloadCache(cubeDesc.getName()); } // remove cubeDesc public void removeLocalCubeDesc(String name) throws IOException { cubeDescMap.removeLocal(name); + Cuboid.reloadCache(name); } private void reloadAllCubeDesc() throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/3d04704e/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 1cf1fe0..9bc2f8c 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 @@ -25,7 +25,6 @@ import org.apache.kylin.common.restclient.Broadcaster; import org.apache.kylin.cube.CubeDescManager; import org.apache.kylin.cube.CubeInstance; import org.apache.kylin.cube.CubeManager; -import org.apache.kylin.cube.cuboid.Cuboid; import org.apache.kylin.invertedindex.IIDescManager; import org.apache.kylin.invertedindex.IIManager; import org.apache.kylin.metadata.MetadataManager; @@ -84,7 +83,6 @@ public class CacheService extends BasicService { break; case CUBE_DESC: getCubeDescManager().reloadCubeDescLocal(cacheKey); - Cuboid.reloadCache(cacheKey); break; case PROJECT: ProjectInstance projectInstance = getProjectManager().reloadProjectLocal(cacheKey); @@ -113,7 +111,6 @@ public class CacheService extends BasicService { MetadataManager.clearCache(); CubeDescManager.clearCache(); CubeManager.clearCache(); - Cuboid.clearCache(); IIDescManager.clearCache(); IIManager.clearCache(); HybridManager.clearCache(); @@ -141,7 +138,6 @@ public class CacheService extends BasicService { break; case CUBE_DESC: getCubeDescManager().removeLocalCubeDesc(cacheKey); - Cuboid.reloadCache(cacheKey); break; case PROJECT: ProjectManager.clearCache();