honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to guava 12.0, closes #1920.

This commit is contained in:
Shay Banon 2012-05-07 20:08:41 +03:00
parent 7bac883837
commit 76e1c3a017
6 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -84,7 +84,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>11.0.2</version>
<version>12.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>

34
src/main/java/org/elasticsearch/common/cache/CacheBuilderHelper.java vendored
View File

@ -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
}
}
}
}

2
src/main/java/org/elasticsearch/index/cache/field/data/resident/ResidentFieldDataCache.java vendored
View File

@ -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();
}

2
src/main/java/org/elasticsearch/index/cache/field/data/soft/SoftFieldDataCache.java vendored
View File

@ -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<String, FieldData> buildFieldDataMap() {
CacheBuilder<String, FieldData> cacheBuilder = CacheBuilder.newBuilder().softValues().removalListener(this);
CacheBuilderHelper.disableStats(cacheBuilder);
return cacheBuilder.build();
}

3
src/main/java/org/elasticsearch/index/cache/query/parser/resident/ResidentQueryParserCache.java vendored
View File

@ -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();
}

3
src/main/java/org/elasticsearch/indices/cache/filter/IndicesFilterCache.java vendored
View File

@ -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();
}