You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/12/14 18:15:13 UTC
svn commit: r1214347 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/src/java/org/apache/lucene/search/
lucene/src/test/org/apache/lucene/search/ solr/
Author: uschindler
Date: Wed Dec 14 17:15:12 2011
New Revision: 1214347
URL: http://svn.apache.org/viewvc?rev=1214347&view=rev
Log:
Reverse merged revision(s) 1214289 from lucene/dev/branches/branch_3x:
LUCENE-3531: Backport adding close listeners to CachingWrapperFilter
(Merged revision(s) 1214274 from lucene/dev/trunk)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java?rev=1214347&r1=1214346&r2=1214347&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingSpanFilter.java Wed Dec 14 17:15:12 2011
@@ -81,7 +81,7 @@ public class CachingSpanFilter extends S
missCount++;
result = filter.bitSpans(reader);
- cache.put(reader, coreKey, delCoreKey, result);
+ cache.put(coreKey, delCoreKey, result);
return result;
}
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1214347&r1=1214346&r2=1214347&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java Wed Dec 14 17:15:12 2011
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.WeakHashMap;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.SegmentReader;
import org.apache.lucene.util.FixedBitSet;
/**
@@ -64,7 +63,7 @@ public class CachingWrapperFilter extend
protected final FilterCache<DocIdSet> cache;
- static abstract class FilterCache<T> implements SegmentReader.CoreClosedListener, IndexReader.ReaderClosedListener, Serializable {
+ static abstract class FilterCache<T> implements Serializable {
/**
* A transient Filter cache (package private because of test)
@@ -113,13 +112,7 @@ public class CachingWrapperFilter extend
protected abstract T mergeDeletes(IndexReader reader, T value);
- public synchronized void put(IndexReader reader, Object coreKey, Object delCoreKey, T value) {
- if (reader instanceof SegmentReader) {
- ((SegmentReader) reader).addCoreClosedListener(this);
- } else {
- reader.addReaderClosedListener(this);
- }
-
+ public synchronized void put(Object coreKey, Object delCoreKey, T value) {
if (deletesMode == DeletesMode.IGNORE) {
cache.put(coreKey, value);
} else if (deletesMode == DeletesMode.RECACHE) {
@@ -129,18 +122,6 @@ public class CachingWrapperFilter extend
cache.put(delCoreKey, value);
}
}
-
- // not until Java 6: @Override
- public synchronized void onClose(IndexReader reader) {
- cache.remove(reader.getCoreCacheKey());
- cache.remove(reader.getDeletesCacheKey());
- }
-
- // not until Java 6: @Override
- public synchronized void onClose(SegmentReader reader) {
- cache.remove(reader.getCoreCacheKey());
- cache.remove(reader.getDeletesCacheKey());
- }
}
/**
@@ -228,7 +209,7 @@ public class CachingWrapperFilter extend
docIdSet = docIdSetToCache(filter.getDocIdSet(reader), reader);
if (docIdSet != null) {
- cache.put(reader, coreKey, delCoreKey, docIdSet);
+ cache.put(coreKey, delCoreKey, docIdSet);
}
return docIdSet;
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1214347&r1=1214346&r2=1214347&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Wed Dec 14 17:15:12 2011
@@ -44,7 +44,7 @@ public class TestCachingWrapperFilter ex
CachingWrapperFilter cacher = new CachingWrapperFilter(filter);
// first time, nested filter is called
- DocIdSet strongRef = cacher.getDocIdSet(reader);
+ cacher.getDocIdSet(reader);
assertTrue("first time", filter.wasCalled());
// make sure no exception if cache is holding the wrong docIdSet