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

LUCENE-3644: Use one instance of the listener class also for composite/SlowMultiReader (to prevent filling the CHS of IR). Also don't use FieldCache.DEFAULT from inside FieldCacheImpl, as it makes extension hard. We have "wrapper" reference for that. 

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

32
lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
View File

@ -148,10 +148,18 @@ class FieldCacheImpl implements FieldCache {
}
// per-segment fieldcaches don't purge until the shared core closes.
final static SegmentReader.CoreClosedListener purgeCore = new SegmentReader.CoreClosedListener() {
// @Override -- not until Java 1.6
final SegmentReader.CoreClosedListener purgeCore = new SegmentReader.CoreClosedListener() {
@Override
public void onClose(SegmentReader owner) {
FieldCache.DEFAULT.purge(owner);
FieldCacheImpl.this.purge(owner);
}
};
// composite/SlowMultiReaderWrapper fieldcaches don't purge until composite reader is closed.
final IndexReader.ReaderClosedListener purgeReader = new IndexReader.ReaderClosedListener() {
@Override
public void onClose(IndexReader owner) {
FieldCacheImpl.this.purge(owner);
}
};
@ -191,14 +199,9 @@ class FieldCacheImpl implements FieldCache {
innerCache = new HashMap<Entry,Object>();
readerCache.put(readerKey, innerCache);
if (reader instanceof SegmentReader) {
((SegmentReader) reader).addCoreClosedListener(purgeCore);
((SegmentReader) reader).addCoreClosedListener(wrapper.purgeCore);
} else {
reader.addReaderClosedListener(new IndexReader.ReaderClosedListener() {
@Override
public void onClose(IndexReader reader) {
FieldCache.DEFAULT.purge(reader);
}
});
reader.addReaderClosedListener(wrapper.purgeReader);
}
}
if (innerCache.get(key) == null) {
@ -221,14 +224,9 @@ class FieldCacheImpl implements FieldCache {
innerCache = new HashMap<Entry,Object>();
readerCache.put(readerKey, innerCache);
if (reader instanceof SegmentReader) {
((SegmentReader) reader).addCoreClosedListener(purgeCore);
((SegmentReader) reader).addCoreClosedListener(wrapper.purgeCore);
} else {
reader.addReaderClosedListener(new IndexReader.ReaderClosedListener() {
@Override
public void onClose(IndexReader reader) {
FieldCache.DEFAULT.purge(reader);
}
});
reader.addReaderClosedListener(wrapper.purgeReader);
}
value = null;
} else {