Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3531: Revert adding Reader/CoreClosedListeners in CachingWrapperFilter 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1214349 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2011-12-14 17:16:53 +00:00
parent a2d8c13021
commit b93f0902ce
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
View File

@ -23,7 +23,6 @@ import java.util.WeakHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.SegmentReader;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.WeakIdentityHashMap;
@ -41,7 +40,7 @@ public class CachingWrapperFilter extends Filter {
private final FilterCache cache = new FilterCache();
private final boolean recacheDeletes;
private static class FilterCache implements SegmentReader.CoreClosedListener, IndexReader.ReaderClosedListener {
private static class FilterCache {
private final WeakHashMap<Object,WeakIdentityHashMap<Bits,SoftReference<DocIdSet>>> cache =
new WeakHashMap<Object,WeakIdentityHashMap<Bits,SoftReference<DocIdSet>>>();
@ -49,13 +48,6 @@ public class CachingWrapperFilter extends Filter {
final Object coreKey = reader.getCoreCacheKey();
WeakIdentityHashMap<Bits,SoftReference<DocIdSet>> innerCache = cache.get(coreKey);
if (innerCache == null) {
if (reader instanceof SegmentReader) {
((SegmentReader) reader).addCoreClosedListener(this);
} else {
assert reader.getSequentialSubReaders() == null :
"we only operate on AtomicContext, so all cached readers must be atomic";
reader.addReaderClosedListener(this);
}
innerCache = new WeakIdentityHashMap<Bits,SoftReference<DocIdSet>>();
cache.put(coreKey, innerCache);
}
@ -67,16 +59,6 @@ public class CachingWrapperFilter extends Filter {
public synchronized void put(IndexReader reader, Bits acceptDocs, DocIdSet value) {
cache.get(reader.getCoreCacheKey()).put(acceptDocs, new SoftReference<DocIdSet>(value));
}
@Override
public synchronized void onClose(IndexReader reader) {
cache.remove(reader.getCoreCacheKey());
}
@Override
public synchronized void onClose(SegmentReader reader) {
cache.remove(reader.getCoreCacheKey());
}
}
/** Wraps another filter's result and caches it.