Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 bad0381df -> 7047077c0


PHOENIX-4640 Don't consider STATS_UPDATE_FREQ_MS_ATTRIB in TTL for server side 
cache


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 7047077c0e708cdf14d05467288c4d4daaabf40f
Parents: bad0381
Author: James Taylor <jtay...@salesforce.com>
Authored: Mon Mar 5 16:27:31 2018 -0800
Committer: James Taylor <jtay...@salesforce.com>
Committed: Mon Mar 5 16:27:31 2018 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/phoenix/cache/GlobalCache.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7047077c/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java 
b/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
index 43df5db..ae77174 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/GlobalCache.java
@@ -92,11 +92,9 @@ public class GlobalCache extends TenantCacheImpl {
             synchronized(this) {
                 result = metaDataCache;
                 if(result == null) {
-                    long maxTTL = Math.min(config.getLong(
+                    long maxTTL = config.getLong(
                             
QueryServices.MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS_ATTRIB,
-                            
QueryServicesOptions.DEFAULT_MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS), 
config.getLong(
-                            QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB,
-                            
QueryServicesOptions.DEFAULT_STATS_UPDATE_FREQ_MS));
+                            
QueryServicesOptions.DEFAULT_MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS);
                     long maxSize = 
config.getLong(QueryServices.MAX_SERVER_METADATA_CACHE_SIZE_ATTRIB,
                             
QueryServicesOptions.DEFAULT_MAX_SERVER_METADATA_CACHE_SIZE);
                     metaDataCache = result = CacheBuilder.newBuilder()

Reply via email to