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/27 07:22:52 UTC
[1/2] incubator-kylin git commit: KYLIN-797 make Cuboid cache flush
be triggered when CubeDesc cache flushed
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 1df6dc407 -> 212c59194
KYLIN-797 make Cuboid cache flush be triggered when CubeDesc cache flushed
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/212c5919
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/212c5919
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/212c5919
Branch: refs/heads/0.7-staging
Commit: 212c59194fd8ab2ad7f123c1bf6b724557ce7559
Parents: fbc958b
Author: shaofengshi <sh...@apache.org>
Authored: Mon Jul 27 13:21:38 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Jul 27 13:22:24 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/util/AbstractKylinTestCase.java | 2 +-
cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java | 2 ++
.../src/main/java/org/apache/kylin/rest/service/CacheService.java | 2 --
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/212c5919/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 cfc04b9..d337501 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.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 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 abstract void createTestMetadata() throws Exception;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/212c5919/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java b/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
index 33ef61c..5806378 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
@@ -84,6 +84,7 @@ public class CubeDescManager {
public static void clearCache() {
CACHE.clear();
+ Cuboid.clearCache();
}
private CubeDescManager(KylinConfig config) throws IOException {
@@ -113,6 +114,7 @@ public class CubeDescManager {
// Here replace the old one
cubeDescMap.putLocal(ndesc.getName(), ndesc);
+ Cuboid.reloadCache(ndesc.getName());
return ndesc;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/212c5919/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 c7a5d86..393e9e4 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
@@ -57,7 +57,6 @@ public class CacheService extends BasicService {
break;
case CUBE_DESC:
getCubeDescManager().reloadCubeDesc(cacheKey);
- Cuboid.reloadCache(cacheKey);
break;
case PROJECT:
getProjectManager().reloadProject(cacheKey);
@@ -83,7 +82,6 @@ public class CacheService extends BasicService {
case ALL:
MetadataManager.clearCache();
CubeDescManager.clearCache();
- Cuboid.clearCache();
CubeManager.clearCache();
IIDescManager.clearCache();
IIManager.clearCache();
[2/2] incubator-kylin git commit: clear cuboid cache when cubo is
deleted
Posted by sh...@apache.org.
clear cuboid cache when cubo is deleted
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/fbc958b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/fbc958b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/fbc958b6
Branch: refs/heads/0.7-staging
Commit: fbc958b682d37c348657f786bfe47fe436816b71
Parents: 1df6dc4
Author: steven zhang <st...@outlook.com>
Authored: Mon Jul 27 12:32:28 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Jul 27 13:22:24 2015 +0800
----------------------------------------------------------------------
cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java | 4 +++-
cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/fbc958b6/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java b/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
index a809d86..33ef61c 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
@@ -24,12 +24,12 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.kylin.common.restclient.CaseInsensitiveStringCache;
import org.apache.commons.lang3.StringUtils;
+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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.ResourceStore;
@@ -176,11 +176,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/fbc958b6/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 075e6ac..6994e02 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -21,6 +21,7 @@ package org.apache.kylin.cube;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.util.Pair;
import org.apache.kylin.common.KylinConfig;
@@ -29,6 +30,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.DimensionDesc;
import org.apache.kylin.dict.Dictionary;
@@ -413,6 +415,7 @@ public class CubeManager implements IRealizationProvider {
final String cubeName = cube.getName().toUpperCase();
cubeMap.remove(cubeName);
usedStorageLocation.removeAll(cubeName);
+ Cuboid.reloadCache(cube.getDescName());
}
public void removeCubeCacheLocal(String cubeName) {