You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/01/31 13:02:01 UTC

[34/50] incubator-kylin git commit: simplify cache clearing

simplify cache clearing


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/29632f52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/29632f52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/29632f52

Branch: refs/heads/inverted-index
Commit: 29632f5280f9647761475f39dcf7c511bf9f981a
Parents: b4bcfc7
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Jan 29 13:38:21 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jan 29 13:38:21 2015 +0800

----------------------------------------------------------------------
 .../main/java/com/kylinolap/cube/CubeDescManager.java   |  4 ----
 cube/src/main/java/com/kylinolap/cube/CubeManager.java  |  4 ++--
 .../java/com/kylinolap/cube/CubeManagerCacheTest.java   |  6 +++---
 .../test/java/com/kylinolap/cube/CubeManagerTest.java   |  6 +++---
 .../com/kylinolap/cube/CubeSizeEstimationCLITest.java   |  2 +-
 .../java/com/kylinolap/cube/SegmentManagementTest.java  |  6 +++---
 .../com/kylinolap/cube/common/RowKeySplitterTest.java   |  2 +-
 .../com/kylinolap/cube/cuboid/CuboidSchedulerTest.java  |  2 +-
 .../test/java/com/kylinolap/cube/cuboid/CuboidTest.java |  2 +-
 .../java/com/kylinolap/cube/kv/RowKeyDecoderTest.java   |  2 +-
 .../java/com/kylinolap/cube/kv/RowKeyEncoderTest.java   |  2 +-
 .../java/com/kylinolap/cube/kv/RowValueDecoderTest.java |  2 +-
 .../main/java/com/kylinolap/dict/DateStrDictionary.java |  6 +-----
 .../main/java/com/kylinolap/dict/DictionaryManager.java | 12 ++++++------
 .../java/com/kylinolap/invertedindex/IIDescManager.java |  4 ----
 .../java/com/kylinolap/invertedindex/IIManager.java     |  4 ----
 job/src/test/java/com/kylinolap/job/DataGenTest.java    |  2 +-
 .../job/hadoop/cube/MergeCuboidMapperTest.java          |  8 ++++----
 .../java/com/kylinolap/metadata/MetadataManager.java    |  6 +++---
 .../com/kylinolap/metadata/project/ProjectManager.java  |  4 ++--
 .../metadata/realization/RealizationRegistry.java       |  4 ++--
 .../java/com/kylinolap/rest/service/BasicService.java   |  4 ++--
 .../java/com/kylinolap/rest/service/CacheService.java   |  2 +-
 .../java/com/kylinolap/rest/service/ProjectService.java |  2 +-
 .../com/kylinolap/rest/service/ServiceTestBase.java     | 10 +++++-----
 25 files changed, 46 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/main/java/com/kylinolap/cube/CubeDescManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeDescManager.java b/cube/src/main/java/com/kylinolap/cube/CubeDescManager.java
index 1564f8e..b687136 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeDescManager.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeDescManager.java
@@ -84,10 +84,6 @@ public class CubeDescManager {
         CACHE.clear();
     }
 
-    public static synchronized void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
-    }
-
     private CubeDescManager(KylinConfig config) throws IOException {
         logger.info("Initializing CubeDescManager with config " + config);
         this.config = config;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/main/java/com/kylinolap/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeManager.java b/cube/src/main/java/com/kylinolap/cube/CubeManager.java
index e4a3f52..5458277 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeManager.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeManager.java
@@ -102,8 +102,8 @@ public class CubeManager implements IRealizationProvider {
         }
     }
 
-    public static synchronized void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
+    public static void clearCache() {
+        CACHE.clear();
     }
 
     // ============================================================================

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/CubeManagerCacheTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/CubeManagerCacheTest.java b/cube/src/test/java/com/kylinolap/cube/CubeManagerCacheTest.java
index b444d45..0bfed93 100644
--- a/cube/src/test/java/com/kylinolap/cube/CubeManagerCacheTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/CubeManagerCacheTest.java
@@ -40,9 +40,9 @@ public class CubeManagerCacheTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
-        CubeManager.removeInstance(getTestConfig());
-        ProjectManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
+        CubeManager.clearCache();
+        ProjectManager.clearCache();
         cubeManager = CubeManager.getInstance(getTestConfig());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/CubeManagerTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/CubeManagerTest.java b/cube/src/test/java/com/kylinolap/cube/CubeManagerTest.java
index cb1a99b..db74594 100644
--- a/cube/src/test/java/com/kylinolap/cube/CubeManagerTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/CubeManagerTest.java
@@ -40,9 +40,9 @@ public class CubeManagerTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
-        CubeManager.removeInstance(getTestConfig());
-        ProjectManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
+        CubeManager.clearCache();
+        ProjectManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/CubeSizeEstimationCLITest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/CubeSizeEstimationCLITest.java b/cube/src/test/java/com/kylinolap/cube/CubeSizeEstimationCLITest.java
index 404daf9..9a45110 100644
--- a/cube/src/test/java/com/kylinolap/cube/CubeSizeEstimationCLITest.java
+++ b/cube/src/test/java/com/kylinolap/cube/CubeSizeEstimationCLITest.java
@@ -21,7 +21,7 @@ public class CubeSizeEstimationCLITest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
 
         String cubeName = "test_kylin_cube_with_slr_ready";
         CubeManager cubeManager = CubeManager.getInstance(getTestConfig());

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/SegmentManagementTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/SegmentManagementTest.java b/cube/src/test/java/com/kylinolap/cube/SegmentManagementTest.java
index 13c7ed3..6608041 100644
--- a/cube/src/test/java/com/kylinolap/cube/SegmentManagementTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/SegmentManagementTest.java
@@ -51,9 +51,9 @@ public class SegmentManagementTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
-        CubeManager.removeInstance(getTestConfig());
-        ProjectManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
+        CubeManager.clearCache();
+        ProjectManager.clearCache();
         cubeMgr = CubeManager.getInstance(getTestConfig());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/common/RowKeySplitterTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/common/RowKeySplitterTest.java b/cube/src/test/java/com/kylinolap/cube/common/RowKeySplitterTest.java
index 8da685d..9683a45 100644
--- a/cube/src/test/java/com/kylinolap/cube/common/RowKeySplitterTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/common/RowKeySplitterTest.java
@@ -35,7 +35,7 @@ public class RowKeySplitterTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidSchedulerTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidSchedulerTest.java b/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidSchedulerTest.java
index 7ab8df8..e59eb2c 100644
--- a/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidSchedulerTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidSchedulerTest.java
@@ -39,7 +39,7 @@ public class CuboidSchedulerTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidTest.java b/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidTest.java
index ba6d3f7..1932128 100644
--- a/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/cuboid/CuboidTest.java
@@ -54,7 +54,7 @@ public class CuboidTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/kv/RowKeyDecoderTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/kv/RowKeyDecoderTest.java b/cube/src/test/java/com/kylinolap/cube/kv/RowKeyDecoderTest.java
index 2117e38..55d9d71 100644
--- a/cube/src/test/java/com/kylinolap/cube/kv/RowKeyDecoderTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/kv/RowKeyDecoderTest.java
@@ -41,7 +41,7 @@ public class RowKeyDecoderTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/kv/RowKeyEncoderTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/kv/RowKeyEncoderTest.java b/cube/src/test/java/com/kylinolap/cube/kv/RowKeyEncoderTest.java
index 4939492..a394d9a 100644
--- a/cube/src/test/java/com/kylinolap/cube/kv/RowKeyEncoderTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/kv/RowKeyEncoderTest.java
@@ -40,7 +40,7 @@ public class RowKeyEncoderTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/cube/src/test/java/com/kylinolap/cube/kv/RowValueDecoderTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/com/kylinolap/cube/kv/RowValueDecoderTest.java b/cube/src/test/java/com/kylinolap/cube/kv/RowValueDecoderTest.java
index 8d54749..ef70e6a 100644
--- a/cube/src/test/java/com/kylinolap/cube/kv/RowValueDecoderTest.java
+++ b/cube/src/test/java/com/kylinolap/cube/kv/RowValueDecoderTest.java
@@ -45,7 +45,7 @@ public class RowValueDecoderTest extends LocalFileMetadataTestCase {
     @Before
     public void setUp() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/dictionary/src/main/java/com/kylinolap/dict/DateStrDictionary.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/com/kylinolap/dict/DateStrDictionary.java b/dictionary/src/main/java/com/kylinolap/dict/DateStrDictionary.java
index ed26aae..0c2ae35 100644
--- a/dictionary/src/main/java/com/kylinolap/dict/DateStrDictionary.java
+++ b/dictionary/src/main/java/com/kylinolap/dict/DateStrDictionary.java
@@ -55,11 +55,7 @@ public class DateStrDictionary extends Dictionary<String> {
         SimpleDateFormat format = formatThreadLocal.get();
         if (format == null) {
             format = new SimpleDateFormat(datePattern);
-            format.setTimeZone(TimeZone.getTimeZone("GMT")); // NOTE: this must
-                                                             // be GMT to
-                                                             // calculate
-                                                             // epoch date
-                                                             // correctly
+            format.setTimeZone(TimeZone.getTimeZone("GMT")); // NOTE: this must be GMT to calculate epoch date correctly
             formatThreadLocal.set(format);
         }
         return format;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java b/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java
index 519a096..0eff4db 100644
--- a/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java
+++ b/dictionary/src/main/java/com/kylinolap/dict/DictionaryManager.java
@@ -48,22 +48,22 @@ public class DictionaryManager {
     private static final DictionaryInfo NONE_INDICATOR = new DictionaryInfo();
 
     // static cached instances
-    private static final ConcurrentHashMap<KylinConfig, DictionaryManager> SERVICE_CACHE = new ConcurrentHashMap<KylinConfig, DictionaryManager>();
+    private static final ConcurrentHashMap<KylinConfig, DictionaryManager> CACHE = new ConcurrentHashMap<KylinConfig, DictionaryManager>();
 
     public static DictionaryManager getInstance(KylinConfig config) {
-        DictionaryManager r = SERVICE_CACHE.get(config);
+        DictionaryManager r = CACHE.get(config);
         if (r == null) {
             r = new DictionaryManager(config);
-            SERVICE_CACHE.put(config, r);
-            if (SERVICE_CACHE.size() > 1) {
+            CACHE.put(config, r);
+            if (CACHE.size() > 1) {
                 logger.warn("More than one singleton exist");
             }
         }
         return r;
     }
 
-    public static void removeInstance(KylinConfig config) {
-        SERVICE_CACHE.remove(config);
+    public static void clearCache() {
+        CACHE.clear();
     }
 
     // ============================================================================

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/invertedindex/src/main/java/com/kylinolap/invertedindex/IIDescManager.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/com/kylinolap/invertedindex/IIDescManager.java b/invertedindex/src/main/java/com/kylinolap/invertedindex/IIDescManager.java
index 0e1ca4c..2b72416 100644
--- a/invertedindex/src/main/java/com/kylinolap/invertedindex/IIDescManager.java
+++ b/invertedindex/src/main/java/com/kylinolap/invertedindex/IIDescManager.java
@@ -81,10 +81,6 @@ public class IIDescManager {
         CACHE.clear();
     }
 
-    public static synchronized void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
-    }
-
     private IIDescManager(KylinConfig config) throws IOException {
         logger.info("Initializing IIDescManager with config " + config);
         this.config = config;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/invertedindex/src/main/java/com/kylinolap/invertedindex/IIManager.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/com/kylinolap/invertedindex/IIManager.java b/invertedindex/src/main/java/com/kylinolap/invertedindex/IIManager.java
index 34f4418..a38e44d 100644
--- a/invertedindex/src/main/java/com/kylinolap/invertedindex/IIManager.java
+++ b/invertedindex/src/main/java/com/kylinolap/invertedindex/IIManager.java
@@ -89,10 +89,6 @@ public class IIManager implements IRealizationProvider {
         CACHE.clear();
     }
 
-    public static synchronized void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
-    }
-
     // ============================================================================
 
     private KylinConfig config;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/job/src/test/java/com/kylinolap/job/DataGenTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/com/kylinolap/job/DataGenTest.java b/job/src/test/java/com/kylinolap/job/DataGenTest.java
index dc6c476..93155a6 100644
--- a/job/src/test/java/com/kylinolap/job/DataGenTest.java
+++ b/job/src/test/java/com/kylinolap/job/DataGenTest.java
@@ -18,7 +18,7 @@ public class DataGenTest extends LocalFileMetadataTestCase {
     @Before
     public void before() throws Exception {
         this.createTestMetadata();
-        MetadataManager.removeInstance(this.getTestConfig());
+        MetadataManager.clearCache();
     }
 
     @After

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/job/src/test/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapperTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapperTest.java b/job/src/test/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapperTest.java
index 97e4abc..f4354b0 100644
--- a/job/src/test/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapperTest.java
+++ b/job/src/test/java/com/kylinolap/job/hadoop/cube/MergeCuboidMapperTest.java
@@ -89,10 +89,10 @@ public class MergeCuboidMapperTest extends LocalFileMetadataTestCase {
 
         logger.info("The metadataUrl is : " + getTestConfig());
 
-        MetadataManager.removeInstance(getTestConfig());
-        CubeManager.removeInstance(getTestConfig());
-        ProjectManager.removeInstance(getTestConfig());
-        DictionaryManager.removeInstance(getTestConfig());
+        MetadataManager.clearCache();
+        CubeManager.clearCache();
+        ProjectManager.clearCache();
+        DictionaryManager.clearCache();
 
         // hack for distributed cache
         // CubeManager.removeInstance(KylinConfig.createInstanceFromUri("../job/meta"));//to

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java b/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
index fbb2ee4..e08971f 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
@@ -85,8 +85,8 @@ public class MetadataManager {
         }
     }
 
-    public static synchronized void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
+    public static void clearCache() {
+        CACHE.clear();
     }
 
     // ============================================================================
@@ -112,7 +112,7 @@ public class MetadataManager {
      * @throws IOException
      */
     public void reload() {
-        removeInstance(config);
+        clearCache();
         getInstance(config);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java b/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
index 20912e6..6a81389 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
@@ -70,8 +70,8 @@ public class ProjectManager {
         }
     }
 
-    public static synchronized void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
+    public static void clearCache() {
+        CACHE.clear();
     }
 
     // ============================================================================

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/metadata/src/main/java/com/kylinolap/metadata/realization/RealizationRegistry.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/com/kylinolap/metadata/realization/RealizationRegistry.java b/metadata/src/main/java/com/kylinolap/metadata/realization/RealizationRegistry.java
index 55e656b..7e99253 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/realization/RealizationRegistry.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/realization/RealizationRegistry.java
@@ -44,8 +44,8 @@ public class RealizationRegistry {
         }
     }
 
-    public static void removeInstance(KylinConfig config) {
-        CACHE.remove(config);
+    public static void clearCache() {
+        CACHE.clear();
     }
 
     // ============================================================================

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/server/src/main/java/com/kylinolap/rest/service/BasicService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/com/kylinolap/rest/service/BasicService.java b/server/src/main/java/com/kylinolap/rest/service/BasicService.java
index 25edc92..d3c1a48 100644
--- a/server/src/main/java/com/kylinolap/rest/service/BasicService.java
+++ b/server/src/main/java/com/kylinolap/rest/service/BasicService.java
@@ -128,8 +128,8 @@ public abstract class BasicService {
      */
     @Caching(evict = { @CacheEvict(value = QueryController.SUCCESS_QUERY_CACHE, allEntries = true), @CacheEvict(value = QueryController.EXCEPTION_QUERY_CACHE, allEntries = true) })
     public void cleanDataCache() {
-        CubeManager.removeInstance(getConfig());
-        ProjectManager.removeInstance(getConfig());
+        CubeManager.clearCache();
+        ProjectManager.clearCache();
         BasicService.resetOLAPDataSources();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/server/src/main/java/com/kylinolap/rest/service/CacheService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/com/kylinolap/rest/service/CacheService.java b/server/src/main/java/com/kylinolap/rest/service/CacheService.java
index 12948af..7187f9f 100644
--- a/server/src/main/java/com/kylinolap/rest/service/CacheService.java
+++ b/server/src/main/java/com/kylinolap/rest/service/CacheService.java
@@ -63,7 +63,7 @@ public class CacheService extends BasicService {
                     getCubeDescManager().removeLocalCubeDesc(cacheKey);
                     break;
                 case PROJECT:
-                    ProjectManager.removeInstance(getConfig());
+                    ProjectManager.clearCache();
                     break;
                 case INVERTED_INDEX:
                     getIIManager().removeIILocalCache(cacheKey);

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/server/src/main/java/com/kylinolap/rest/service/ProjectService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/com/kylinolap/rest/service/ProjectService.java b/server/src/main/java/com/kylinolap/rest/service/ProjectService.java
index 2e975cb..7116e04 100644
--- a/server/src/main/java/com/kylinolap/rest/service/ProjectService.java
+++ b/server/src/main/java/com/kylinolap/rest/service/ProjectService.java
@@ -112,7 +112,7 @@ public class ProjectService extends BasicService {
     }
 
     public void removeProjectCache(String name) {
-        ProjectManager.removeInstance(getConfig());
+        ProjectManager.clearCache();
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/29632f52/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java b/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java
index 6cb6a3d..a5fe615 100644
--- a/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java
+++ b/server/src/test/java/com/kylinolap/rest/service/ServiceTestBase.java
@@ -59,11 +59,11 @@ public class ServiceTestBase extends HBaseMetadataTestCase { //HBaseMetadataTest
     public void setUp() throws Exception {
         this.createTestMetadata();
 
-        MetadataManager.removeInstance(this.getTestConfig());
-        DictionaryManager.removeInstance(this.getTestConfig());
-        CubeManager.removeInstance(this.getTestConfig());
-        IIManager.removeInstance(this.getTestConfig());
-        ProjectManager.removeInstance(this.getTestConfig());
+        MetadataManager.clearCache();
+        DictionaryManager.clearCache();
+        CubeManager.clearCache();
+        IIManager.clearCache();
+        ProjectManager.clearCache();
     }
 
     @After