You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/09/17 00:06:31 UTC
svn commit: r1625413 - in /lucene/dev/branches/lucene_solr_4_9: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
Author: mikemccand
Date: Tue Sep 16 22:06:30 2014
New Revision: 1625413
URL: http://svn.apache.org/r1625413
Log:
LUCENE-5922: backport to 4.9.x
Modified:
lucene/dev/branches/lucene_solr_4_9/ (props changed)
lucene/dev/branches/lucene_solr_4_9/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_9/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_9/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_9/lucene/core/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
Modified: lucene/dev/branches/lucene_solr_4_9/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/lucene/CHANGES.txt?rev=1625413&r1=1625412&r2=1625413&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_9/lucene/CHANGES.txt Tue Sep 16 22:06:30 2014
@@ -18,6 +18,9 @@ Bug fixes
possibly deleting a file that's still in use in the index, leading
to corruption. (Mike McCandless)
+* LUCENE-5922: DocValuesDocIdSet on 5.x and FieldCacheDocIdSet on 4.x
+ are not cacheable. (Adrien Grand)
+
======================= Lucene 4.9.0 =======================
Changes in Runtime Behavior
Modified: lucene/dev/branches/lucene_solr_4_9/lucene/core/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/lucene/core/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java?rev=1625413&r1=1625412&r2=1625413&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/lucene/core/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java (original)
+++ lucene/dev/branches/lucene_solr_4_9/lucene/core/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java Tue Sep 16 22:06:30 2014
@@ -45,15 +45,6 @@ public abstract class FieldCacheDocIdSet
*/
protected abstract boolean matchDoc(int doc);
- /**
- * this DocIdSet is always cacheable (does not go back
- * to the reader for iteration)
- */
- @Override
- public final boolean isCacheable() {
- return true;
- }
-
@Override
public final Bits bits() {
return (acceptDocs == null) ? new Bits() {
Modified: lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1625413&r1=1625412&r2=1625413&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene_solr_4_9/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Tue Sep 16 22:06:30 2014
@@ -35,7 +35,7 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
+import org.apache.lucene.util.WAH8DocIdSet;
public class TestCachingWrapperFilter extends LuceneTestCase {
Directory dir;
@@ -235,7 +235,7 @@ public class TestCachingWrapperFilter ex
if (originalSet.isCacheable()) {
assertEquals("Cached DocIdSet must be of same class like uncached, if cacheable", originalSet.getClass(), cachedSet.getClass());
} else {
- assertTrue("Cached DocIdSet must be an FixedBitSet if the original one was not cacheable", cachedSet instanceof FixedBitSet || cachedSet == null);
+ assertTrue("Cached DocIdSet must be an WAH8DocIdSet if the original one was not cacheable", cachedSet instanceof WAH8DocIdSet || cachedSet == null);
}
}
}
@@ -253,7 +253,7 @@ public class TestCachingWrapperFilter ex
// returns default empty docidset, always cacheable:
assertDocIdSetCacheable(reader, NumericRangeFilter.newIntRange("test", Integer.valueOf(10000), Integer.valueOf(-10000), true, true), true);
// is cacheable:
- assertDocIdSetCacheable(reader, FieldCacheRangeFilter.newIntRange("test", Integer.valueOf(10), Integer.valueOf(20), true, true), true);
+ assertDocIdSetCacheable(reader, FieldCacheRangeFilter.newIntRange("test", Integer.valueOf(10), Integer.valueOf(20), true, true), false);
// a fixedbitset filter is always cacheable
assertDocIdSetCacheable(reader, new Filter() {
@Override