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 2015/07/20 08:30:39 UTC
incubator-kylin git commit: KYLIN-898 clear "CUBOID_CACHE" in
Cuboid.java
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 8a761579d -> d8f491763
KYLIN-898 clear "CUBOID_CACHE" in Cuboid.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/d8f49176
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d8f49176
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d8f49176
Branch: refs/heads/0.7-staging
Commit: d8f4917635ffe5db0402b63a1841cf36d9334c68
Parents: 8a76157
Author: shaofengshi <sh...@apache.org>
Authored: Mon Jul 20 14:30:19 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Jul 20 14:30:30 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/util/AbstractKylinTestCase.java | 2 +-
cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java | 8 ++++++++
.../java/org/apache/kylin/rest/service/CacheService.java | 3 +++
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d8f49176/common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java b/common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java
index d337501..cfc04b9 100644
--- a/common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java
+++ b/common/src/test/java/org/apache/kylin/common/util/AbstractKylinTestCase.java
@@ -36,7 +36,7 @@ public abstract class AbstractKylinTestCase {
public static final String SANDBOX_TEST_DATA = "../examples/test_case_data/sandbox";
- public static final String[] SERVICES_WITH_CACHE = { "org.apache.kylin.metadata.MetadataManager", "org.apache.kylin.cube.CubeManager", "org.apache.kylin.cube.CubeDescManager", "org.apache.kylin.invertedindex.IIDescManager", "org.apache.kylin.invertedindex.IIManager", "org.apache.kylin.metadata.realization.RealizationRegistry", "org.apache.kylin.storage.hybrid.HybridManager", "org.apache.kylin.metadata.project.ProjectManager" };
+ public static final String[] SERVICES_WITH_CACHE = { "org.apache.kylin.metadata.MetadataManager", "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.metadata.realization.RealizationRegistry", "org.apache.kylin.storage.hybrid.HybridManager", "org.apache.kylin.metadata.project.ProjectManager" };
public abstract void createTestMetadata() throws Exception;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d8f49176/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java b/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
index 839e757..488091a 100644
--- a/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
+++ b/cube/src/main/java/org/apache/kylin/cube/cuboid/Cuboid.java
@@ -286,6 +286,14 @@ public class Cuboid implements Comparable<Cuboid> {
return requirePostAggregation;
}
+ public static void clearCache() {
+ CUBOID_CACHE.clear();
+ }
+
+ public static void reloadCache(String cubeDescName) {
+ CUBOID_CACHE.remove(cubeDescName);
+ }
+
@Override
public String toString() {
return "Cuboid [id=" + id + "]";
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d8f49176/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 f68fd91..3aa3385 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
@@ -21,6 +21,7 @@ package org.apache.kylin.rest.service;
import org.apache.kylin.common.restclient.Broadcaster;
import org.apache.kylin.cube.CubeDescManager;
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;
@@ -51,6 +52,7 @@ public class CacheService extends BasicService {
break;
case CUBE_DESC:
getCubeDescManager().reloadCubeDesc(cacheKey);
+ Cuboid.reloadCache(cacheKey);
break;
case PROJECT:
getProjectManager().reloadProject(cacheKey);
@@ -76,6 +78,7 @@ public class CacheService extends BasicService {
case ALL:
MetadataManager.clearCache();
CubeDescManager.clearCache();
+ Cuboid.clearCache();
CubeManager.clearCache();
IIDescManager.clearCache();
IIManager.clearCache();