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/01/29 18:08:22 UTC
svn commit: r1562508 - in /lucene/dev/branches/lucene5376/lucene:
core/src/java/org/apache/lucene/search/
facet/src/java/org/apache/lucene/facet/range/
Author: mikemccand
Date: Wed Jan 29 17:08:22 2014
New Revision: 1562508
URL: http://svn.apache.org/r1562508
Log:
LUCENE-5418: throw UOE from Filter.docIdSet again
Removed:
lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/SlowBitsDocIdSetIterator.java
Modified:
lucene/dev/branches/lucene5376/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java
lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java
Modified: lucene/dev/branches/lucene5376/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1562508&r1=1562507&r2=1562508&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/branches/lucene5376/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java Wed Jan 29 17:08:22 2014
@@ -345,15 +345,6 @@ public class FilteredQuery extends Query
public Query rewrite(IndexReader reader) throws IOException {
final Query queryRewritten = query.rewrite(reader);
- if (queryRewritten instanceof MatchAllDocsQuery) {
- // Special case: If the query is a MatchAllDocsQuery, we only
- // return a CSQ(filter).
- final Query rewritten = new ConstantScoreQuery(filter);
- // Combine boost of MatchAllDocsQuery and the wrapped rewritten query:
- rewritten.setBoost(this.getBoost() * queryRewritten.getBoost());
- return rewritten;
- }
-
if (queryRewritten != query) {
// rewrite to a new FilteredQuery wrapping the rewritten query
final Query rewritten = new FilteredQuery(queryRewritten, filter, strategy);
Modified: lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java?rev=1562508&r1=1562507&r2=1562508&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java (original)
+++ lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java Wed Jan 29 17:08:22 2014
@@ -141,7 +141,7 @@ public final class DoubleRange extends R
@Override
public DocIdSetIterator iterator() {
- return new SlowBitsDocIdSetIterator(bits(), maxDoc, acceptDocs);
+ throw new UnsupportedOperationException("this filter can only be accessed via bits()");
}
};
}
Modified: lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java?rev=1562508&r1=1562507&r2=1562508&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java (original)
+++ lucene/dev/branches/lucene5376/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java Wed Jan 29 17:08:22 2014
@@ -133,7 +133,7 @@ public final class LongRange extends Ran
@Override
public DocIdSetIterator iterator() {
- return new SlowBitsDocIdSetIterator(bits(), maxDoc, acceptDocs);
+ throw new UnsupportedOperationException("this filter can only be accessed via bits()");
}
};
}