Repository: kylin
Updated Branches:
  refs/heads/2.x-staging e5653278c -> 368430527


KYLIN-1352 Fix storage cache issue in high-concurrency query situation


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

Branch: refs/heads/2.x-staging
Commit: 36843052712c286b93af36f73d1e8ab582b27021
Parents: e565327
Author: lidongsjtu <lid...@apache.org>
Authored: Thu Jan 21 10:52:36 2016 +0800
Committer: lidongsjtu <lid...@apache.org>
Committed: Thu Jan 21 14:07:01 2016 +0800

----------------------------------------------------------------------
 .../apache/kylin/storage/cache/AbstractCacheFledgedQuery.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/36843052/core-storage/src/main/java/org/apache/kylin/storage/cache/AbstractCacheFledgedQuery.java
----------------------------------------------------------------------
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/cache/AbstractCacheFledgedQuery.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/cache/AbstractCacheFledgedQuery.java
index 745ddd1..18011e4 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/cache/AbstractCacheFledgedQuery.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/cache/AbstractCacheFledgedQuery.java
@@ -58,7 +58,7 @@ public abstract class AbstractCacheFledgedQuery implements 
IStorageQuery, TeeTup
                 //maxBytesLocalHeap(10, MemoryUnit.MEGABYTES).//
                 persistence(new 
PersistenceConfiguration().strategy(PersistenceConfiguration.Strategy.NONE)));
 
-        CACHE_MANAGER.addCache(storageCache);
+        CACHE_MANAGER.addCacheIfAbsent(storageCache);
     }
 
     protected StreamSQLResult getStreamSQLResult(StreamSQLDigest 
streamSQLDigest) {
@@ -103,8 +103,7 @@ public abstract class AbstractCacheFledgedQuery implements 
IStorageQuery, TeeTup
                     //maxBytesLocalHeap(templateConf.getMaxBytesLocalHeap(), 
MemoryUnit.BYTES).//using pooled size
                     persistence(templateConf.getPersistenceConfiguration()));
 
-            CACHE_MANAGER.addCache(storageCache);
-
+            CACHE_MANAGER.addCacheIfAbsent(storageCache);
         }
     }
 }

Reply via email to