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

add explicit filter clears on reader finished

This commit is contained in:
kimchy 2011-05-22 01:15:23 +03:00
parent 0d334bfd03
commit 10de33c94e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/elasticsearch/src/main/java/org/elasticsearch/index/cache/filter/support/AbstractConcurrentMapFilterCache.java vendored
View File

@ -49,7 +49,7 @@ import static org.elasticsearch.common.util.concurrent.ConcurrentCollections.*;
* *
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
*/ */
public abstract class AbstractConcurrentMapFilterCache extends AbstractIndexComponent implements FilterCache { public abstract class AbstractConcurrentMapFilterCache extends AbstractIndexComponent implements FilterCache, IndexReader.ReaderFinishedListener {
final ConcurrentMap<Object, ReaderValue> cache; final ConcurrentMap<Object, ReaderValue> cache;
@ -97,6 +97,14 @@ public abstract class AbstractConcurrentMapFilterCache extends AbstractIndexComp
cache.clear(); cache.clear();
} }
@Override public void finished(IndexReader reader) {
ReaderValue readerValue = cache.remove(reader.getCoreCacheKey());
// help soft/weak handling GC
if (readerValue != null) {
readerValue.filters().clear();
}
}
@Override public void clear(IndexReader reader) { @Override public void clear(IndexReader reader) {
ReaderValue readerValue = cache.remove(reader.getCoreCacheKey()); ReaderValue readerValue = cache.remove(reader.getCoreCacheKey());
// help soft/weak handling GC // help soft/weak handling GC
@ -156,6 +164,8 @@ public abstract class AbstractConcurrentMapFilterCache extends AbstractIndexComp
ReaderValue prev = cache.cache.putIfAbsent(reader.getCoreCacheKey(), readerValue); ReaderValue prev = cache.cache.putIfAbsent(reader.getCoreCacheKey(), readerValue);
if (prev != null) { if (prev != null) {
readerValue = prev; readerValue = prev;
} else {
reader.addReaderFinishedListener(cache);
} }
} }
DocSet docSet = readerValue.filters().get(filter); DocSet docSet = readerValue.filters().get(filter);