From 76e1c3a017e76fca10712ad730d5454d85bf6d30 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Mon, 7 May 2012 20:08:41 +0300 Subject: [PATCH] Upgrade to guava 12.0, closes #1920. --- pom.xml | 2 +- .../common/cache/CacheBuilderHelper.java | 34 ------------------- .../data/resident/ResidentFieldDataCache.java | 2 -- .../field/data/soft/SoftFieldDataCache.java | 2 -- .../resident/ResidentQueryParserCache.java | 3 -- .../cache/filter/IndicesFilterCache.java | 3 -- 6 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 src/main/java/org/elasticsearch/common/cache/CacheBuilderHelper.java diff --git a/pom.xml b/pom.xml index 82581c99307..f8eecf938de 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ com.google.guava guava - 11.0.2 + 12.0 compile diff --git a/src/main/java/org/elasticsearch/common/cache/CacheBuilderHelper.java b/src/main/java/org/elasticsearch/common/cache/CacheBuilderHelper.java deleted file mode 100644 index 01ca9d9670b..00000000000 --- a/src/main/java/org/elasticsearch/common/cache/CacheBuilderHelper.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.elasticsearch.common.cache; - -import com.google.common.cache.CacheBuilder; - -import java.lang.reflect.Method; - -/** - */ -public class CacheBuilderHelper { - - private static final Method cacheBuilderDisableStatsMethod; - - static { - Method cacheBuilderDisableStatsMethodX = null; - try { - cacheBuilderDisableStatsMethodX = CacheBuilder.class.getDeclaredMethod("disableStats"); - cacheBuilderDisableStatsMethodX.setAccessible(true); - } catch (Exception e) { - e.printStackTrace(); - } - cacheBuilderDisableStatsMethod = cacheBuilderDisableStatsMethodX; - } - - public static void disableStats(CacheBuilder cacheBuilder) { - if (cacheBuilderDisableStatsMethod != null) { - try { - cacheBuilderDisableStatsMethod.invoke(cacheBuilder); - } catch (Exception e) { - e.printStackTrace(); - // ignore - } - } - } -} diff --git a/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java index d46d7593c94..6bd2effb578 100644 --- a/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java +++ b/src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java @@ -26,7 +26,6 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import org.elasticsearch.ElasticSearchException; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.common.cache.CacheBuilderHelper; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.metrics.CounterMetric; import org.elasticsearch.common.settings.Settings; @@ -80,7 +79,6 @@ public class ResidentFieldDataCache extends AbstractConcurrentMapFieldDataCache if (expire != null) { cacheBuilder.expireAfterAccess(expire.nanos(), TimeUnit.NANOSECONDS); } - CacheBuilderHelper.disableStats(cacheBuilder); return cacheBuilder.build(); } diff --git a/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java b/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java index ffa5b01f0ef..38f83fd6105 100644 --- a/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java +++ b/src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java @@ -23,7 +23,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; -import org.elasticsearch.common.cache.CacheBuilderHelper; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.metrics.CounterMetric; import org.elasticsearch.common.settings.Settings; @@ -47,7 +46,6 @@ public class SoftFieldDataCache extends AbstractConcurrentMapFieldDataCache impl @Override protected Cache buildFieldDataMap() { CacheBuilder cacheBuilder = CacheBuilder.newBuilder().softValues().removalListener(this); - CacheBuilderHelper.disableStats(cacheBuilder); return cacheBuilder.build(); } diff --git a/src/main/java/org/elasticsearch/index/cache/query/parser/resident/ResidentQueryParserCache.java b/src/main/java/org/elasticsearch/index/cache/query/parser/resident/ResidentQueryParserCache.java index b95bdbc7409..6b55deb5774 100644 --- a/src/main/java/org/elasticsearch/index/cache/query/parser/resident/ResidentQueryParserCache.java +++ b/src/main/java/org/elasticsearch/index/cache/query/parser/resident/ResidentQueryParserCache.java @@ -24,7 +24,6 @@ import com.google.common.cache.CacheBuilder; import org.apache.lucene.queryParser.QueryParserSettings; import org.apache.lucene.search.Query; import org.elasticsearch.ElasticSearchException; -import org.elasticsearch.common.cache.CacheBuilderHelper; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -59,8 +58,6 @@ public class ResidentQueryParserCache extends AbstractIndexComponent implements cacheBuilder.expireAfterAccess(expire.nanos(), TimeUnit.NANOSECONDS); } - CacheBuilderHelper.disableStats(cacheBuilder); - this.cache = cacheBuilder.build(); } diff --git a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java index 2fba6abc045..08b0cffb3b7 100644 --- a/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java +++ b/src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java @@ -26,7 +26,6 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import com.google.common.collect.ImmutableMap; import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.common.cache.CacheBuilderHelper; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; @@ -110,8 +109,6 @@ public class IndicesFilterCache extends AbstractComponent implements RemovalList cacheBuilder.expireAfterAccess(expire.millis(), TimeUnit.MILLISECONDS); } - CacheBuilderHelper.disableStats(cacheBuilder); - cache = cacheBuilder.build(); }