Core: Remove DocSetCache.

This class was unused. Close #7582
elastic · Sep 8, 2014 · ed8906b · ed8906b
1 parent d643873
commit ed8906b
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 403 deletions.
diff --git a/src/main/java/org/elasticsearch/index/cache/IndexCache.java b/src/main/java/org/elasticsearch/index/cache/IndexCache.java
@@ -29,7 +29,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
-import org.elasticsearch.index.cache.docset.DocSetCache;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.cache.fixedbitset.FixedBitSetFilterCache;
 import org.elasticsearch.index.cache.query.parser.QueryParserCache;
@@ -42,17 +41,15 @@ public class IndexCache extends AbstractIndexComponent implements CloseableCompo
 
     private final FilterCache filterCache;
     private final QueryParserCache queryParserCache;
-    private final DocSetCache docSetCache;
     private final FixedBitSetFilterCache fixedBitSetFilterCache;
 
     private ClusterService clusterService;
 
     @Inject
-    public IndexCache(Index index, @IndexSettings Settings indexSettings, FilterCache filterCache, QueryParserCache queryParserCache, DocSetCache docSetCache, FixedBitSetFilterCache fixedBitSetFilterCache) {
+    public IndexCache(Index index, @IndexSettings Settings indexSettings, FilterCache filterCache, QueryParserCache queryParserCache, FixedBitSetFilterCache fixedBitSetFilterCache) {
         super(index, indexSettings);
         this.filterCache = filterCache;
         this.queryParserCache = queryParserCache;
-        this.docSetCache = docSetCache;
         this.fixedBitSetFilterCache = fixedBitSetFilterCache;
     }
 
@@ -68,10 +65,6 @@ public FilterCache filter() {
         return filterCache;
     }
 
-    public DocSetCache docSet() {
-        return this.docSetCache;
-    }
-
     public QueryParserCache queryParserCache() {
         return this.queryParserCache;
     }
@@ -80,7 +73,6 @@ public QueryParserCache queryParserCache() {
     public void close() throws ElasticsearchException {
         filterCache.close();
         queryParserCache.close();
-        docSetCache.clear("close");
         fixedBitSetFilterCache.close();
         if (clusterService != null) {
             clusterService.remove(this);
@@ -90,7 +82,6 @@ public void close() throws ElasticsearchException {
     public void clear(String reason) {
         filterCache.clear(reason);
         queryParserCache.clear();
-        docSetCache.clear(reason);
         fixedBitSetFilterCache.clear(reason);
     }
 

diff --git a/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java b/src/main/java/org/elasticsearch/index/cache/IndexCacheModule.java
@@ -21,7 +21,6 @@
 
 import org.elasticsearch.common.inject.AbstractModule;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.index.cache.docset.DocSetCacheModule;
 import org.elasticsearch.index.cache.filter.FilterCacheModule;
 import org.elasticsearch.index.cache.fixedbitset.FixedBitSetFilterCacheModule;
 import org.elasticsearch.index.cache.query.parser.QueryParserCacheModule;
@@ -41,7 +40,6 @@ public IndexCacheModule(Settings settings) {
     protected void configure() {
         new FilterCacheModule(settings).configure(binder());
         new QueryParserCacheModule(settings).configure(binder());
-        new DocSetCacheModule(settings).configure(binder());
         new FixedBitSetFilterCacheModule(settings).configure(binder());
 
         bind(IndexCache.class).asEagerSingleton();

diff --git a/src/main/java/org/elasticsearch/index/cache/docset/DocSetCache.java b/src/main/java/org/elasticsearch/index/cache/docset/DocSetCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/docset/DocSetCacheModule.java b/src/main/java/org/elasticsearch/index/cache/docset/DocSetCacheModule.java
diff --git a/src/main/java/org/elasticsearch/index/cache/docset/none/NoneDocSetCache.java b/src/main/java/org/elasticsearch/index/cache/docset/none/NoneDocSetCache.java
diff --git a/src/main/java/org/elasticsearch/index/cache/docset/simple/SimpleDocSetCache.java b/src/main/java/org/elasticsearch/index/cache/docset/simple/SimpleDocSetCache.java
diff --git a/src/main/java/org/elasticsearch/percolator/PercolateContext.java b/src/main/java/org/elasticsearch/percolator/PercolateContext.java
@@ -31,10 +31,9 @@
 import org.elasticsearch.common.text.StringText;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.index.analysis.AnalysisService;
-import org.elasticsearch.index.cache.docset.DocSetCache;
 import org.elasticsearch.index.cache.filter.FilterCache;
-import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.cache.fixedbitset.FixedBitSetFilterCache;
+import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
 import org.elasticsearch.index.fieldvisitor.JustSourceFieldsVisitor;
 import org.elasticsearch.index.mapper.FieldMapper;
@@ -455,11 +454,6 @@ public FixedBitSetFilterCache fixedBitSetFilterCache() {
         return indexService.fixedBitSetFilterCache();
     }
 
-    @Override
-    public DocSetCache docSetCache() {
-        return indexService.cache().docSet();
-    }
-
     @Override
     public long timeoutInMillis() {
         return -1;

diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsContext.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/tophits/TopHitsContext.java
@@ -28,7 +28,6 @@
 import org.elasticsearch.cache.recycler.PageCacheRecycler;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.index.analysis.AnalysisService;
-import org.elasticsearch.index.cache.docset.DocSetCache;
 import org.elasticsearch.index.cache.filter.FilterCache;
 import org.elasticsearch.index.cache.fixedbitset.FixedBitSetFilterCache;
 import org.elasticsearch.index.fielddata.IndexFieldDataService;
@@ -336,11 +335,6 @@ public FixedBitSetFilterCache fixedBitSetFilterCache() {
         return context.fixedBitSetFilterCache();
     }
 
-    @Override
-    public DocSetCache docSetCache() {
-        return context.docSetCache();
-    }
-
     @Override
     public IndexFieldDataService fieldData() {
         return context.fieldData();