It does not have an upper bound on the number of clauses covered in the range. - * - *
This query matches the documents looking for terms that fall into the - * supplied range according to {@link String#compareTo(String)}. It is not intended - * for numerical ranges, use {@link NumericRangeQuery} instead. - * - *
This query is hardwired to {@link MultiTermQuery#CONSTANT_SCORE_AUTO_REWRITE_DEFAULT}. - * If you want to change this, use {@link TermRangeQuery} instead. - * - * @deprecated Use {@link TermRangeQuery} for term ranges or - * {@link NumericRangeQuery} for numeric ranges instead. - * This class will be removed in Lucene 3.0. - */ -public class ConstantScoreRangeQuery extends TermRangeQuery -{ - - public ConstantScoreRangeQuery(String fieldName, String lowerVal, String upperVal, boolean includeLower, boolean includeUpper) - { - super(fieldName, lowerVal, upperVal, includeLower, includeUpper); - rewriteMethod = CONSTANT_SCORE_AUTO_REWRITE_DEFAULT; - } - - public ConstantScoreRangeQuery(String fieldName, String lowerVal, - String upperVal, boolean includeLower, - boolean includeUpper, Collator collator) { - super(fieldName, lowerVal, upperVal, includeLower, includeUpper, collator); - rewriteMethod = CONSTANT_SCORE_AUTO_REWRITE_DEFAULT; - } - - public String getLowerVal() { - return getLowerTerm(); - } - - public String getUpperVal() { - return getUpperTerm(); - } - - /** Changes of mode are not supported by this class (fixed to constant score rewrite mode) */ - public void setRewriteMethod(RewriteMethod method) { - throw new UnsupportedOperationException("Use TermRangeQuery instead to change the rewrite method."); - } -} Index: src/java/org/apache/lucene/search/RangeFilter.java =================================================================== --- src/java/org/apache/lucene/search/RangeFilter.java (revision 824118) +++ src/java/org/apache/lucene/search/RangeFilter.java (working copy) @@ -1,92 +0,0 @@ -package org.apache.lucene.search; - -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.text.Collator; - -/** - * A Filter that restricts search results to a range of values in a given - * field. - * - *
This filter matches the documents looking for terms that fall into the - * supplied range according to {@link String#compareTo(String)}. It is not intended - * for numerical ranges, use {@link NumericRangeFilter} instead. - * - *
If you construct a large number of range filters with different ranges but on the
- * same field, {@link FieldCacheRangeFilter} may have significantly better performance.
- *
- * @deprecated Use {@link TermRangeFilter} for term ranges or
- * {@link NumericRangeFilter} for numeric ranges instead.
- * This class will be removed in Lucene 3.0.
- */
-public class RangeFilter extends MultiTermQueryWrapperFilter {
-
- /**
- * @param fieldName The field this range applies to
- * @param lowerTerm The lower bound on this range
- * @param upperTerm The upper bound on this range
- * @param includeLower Does this range include the lower bound?
- * @param includeUpper Does this range include the upper bound?
- * @throws IllegalArgumentException if both terms are null or if
- * lowerTerm is null and includeLower is true (similar for upperTerm
- * and includeUpper)
- */
- public RangeFilter(String fieldName, String lowerTerm, String upperTerm,
- boolean includeLower, boolean includeUpper) {
- super(new TermRangeQuery(fieldName, lowerTerm, upperTerm, includeLower, includeUpper));
- }
-
- /**
- * WARNING: Using this constructor and supplying a non-null
- * value in the collator parameter will cause every single
- * index Term in the Field referenced by lowerTerm and/or upperTerm to be
- * examined. Depending on the number of index Terms in this Field, the
- * operation could be very slow.
- *
- * @param lowerTerm The lower bound on this range
- * @param upperTerm The upper bound on this range
- * @param includeLower Does this range include the lower bound?
- * @param includeUpper Does this range include the upper bound?
- * @param collator The collator to use when determining range inclusion; set
- * to null to use Unicode code point ordering instead of collation.
- * @throws IllegalArgumentException if both terms are null or if
- * lowerTerm is null and includeLower is true (similar for upperTerm
- * and includeUpper)
- */
- public RangeFilter(String fieldName, String lowerTerm, String upperTerm,
- boolean includeLower, boolean includeUpper,
- Collator collator) {
- super(new TermRangeQuery(fieldName, lowerTerm, upperTerm, includeLower, includeUpper, collator));
- }
-
- /**
- * Constructs a filter for field fieldName matching
- * less than or equal to upperTerm.
- */
- public static RangeFilter Less(String fieldName, String upperTerm) {
- return new RangeFilter(fieldName, null, upperTerm, false, true);
- }
-
- /**
- * Constructs a filter for field fieldName matching
- * greater than or equal to lowerTerm.
- */
- public static RangeFilter More(String fieldName, String lowerTerm) {
- return new RangeFilter(fieldName, lowerTerm, null, true, false);
- }
-}
Index: src/java/org/apache/lucene/search/RangeQuery.java
===================================================================
--- src/java/org/apache/lucene/search/RangeQuery.java (revision 824118)
+++ src/java/org/apache/lucene/search/RangeQuery.java (working copy)
@@ -1,154 +0,0 @@
-package org.apache.lucene.search;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.text.Collator;
-import java.io.IOException;
-
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.Term;
-
-/**
- * A Query that matches documents within an exclusive range of terms.
- *
- *
This query matches the documents looking for terms that fall into the - * supplied range according to {@link Term#compareTo(Term)}. It is not intended - * for numerical ranges, use {@link NumericRangeQuery} instead. - * - *
This query uses {@linkplain
- * MultiTermQuery#SCORING_BOOLEAN_QUERY_REWRITE}. If you
- * want to change this, use the new {@link TermRangeQuery}
- * instead.
- *
- * @deprecated Use {@link TermRangeQuery} for term ranges or
- * {@link NumericRangeQuery} for numeric ranges instead.
- * This class will be removed in Lucene 3.0.
- */
-public class RangeQuery extends Query {
- private final TermRangeQuery delegate;
-
- /** Constructs a query selecting all terms greater than
- * lowerTerm but less than upperTerm.
- * There must be at least one term and either term may be null,
- * in which case there is no bound on that side, but if there are
- * two terms, both terms must be for the same field.
- *
- * @param lowerTerm The Term at the lower end of the range
- * @param upperTerm The Term at the upper end of the range
- * @param inclusive If true, both lowerTerm and
- * upperTerm will themselves be included in the range.
- */
- public RangeQuery(Term lowerTerm, Term upperTerm, boolean inclusive) {
- this(lowerTerm, upperTerm, inclusive, null);
- }
-
- /** Constructs a query selecting all terms greater than
- * lowerTerm but less than upperTerm.
- * There must be at least one term and either term may be null,
- * in which case there is no bound on that side, but if there are
- * two terms, both terms must be for the same field.
- *
- * If collator is not null, it will be used to decide whether
- * index terms are within the given range, rather than using the Unicode code
- * point order in which index terms are stored.
- *
- * WARNING: Using this constructor and supplying a non-null
- * value in the collator parameter will cause every single
- * index Term in the Field referenced by lowerTerm and/or upperTerm to be
- * examined. Depending on the number of index Terms in this Field, the
- * operation could be very slow.
- *
- * @param lowerTerm The Term at the lower end of the range
- * @param upperTerm The Term at the upper end of the range
- * @param inclusive If true, both lowerTerm and
- * upperTerm will themselves be included in the range.
- * @param collator The collator to use to collate index Terms, to determine
- * their membership in the range bounded by lowerTerm and
- * upperTerm.
- */
- public RangeQuery(Term lowerTerm, Term upperTerm, boolean inclusive, Collator collator) {
- if (lowerTerm == null && upperTerm == null)
- throw new IllegalArgumentException("At least one term must be non-null");
- if (lowerTerm != null && upperTerm != null && lowerTerm.field() != upperTerm.field())
- throw new IllegalArgumentException("Both terms must have the same field");
-
- delegate = new TermRangeQuery(
- (lowerTerm == null) ? upperTerm.field() : lowerTerm.field(),
- (lowerTerm == null) ? null : lowerTerm.text(),
- (upperTerm == null) ? null : upperTerm.text(),
- inclusive, inclusive,
- collator
- );
- delegate.setRewriteMethod(TermRangeQuery.SCORING_BOOLEAN_QUERY_REWRITE);
- }
-
- public void setBoost(float b) {
- super.setBoost(b);
- delegate.setBoost(b);
- }
-
- public Query rewrite(IndexReader reader) throws IOException {
- return delegate.rewrite(reader);
- }
-
- /** Returns the field name for this query */
- public String getField() {
- return delegate.getField();
- }
-
- /** Returns the lower term of this range query. */
- public Term getLowerTerm() {
- final String term = delegate.getLowerTerm();
- return (term == null) ? null : new Term(getField(), term);
- }
-
- /** Returns the upper term of this range query. */
- public Term getUpperTerm() {
- final String term = delegate.getUpperTerm();
- return (term == null) ? null : new Term(getField(), term);
- }
-
- /** Returns true if the range query is inclusive */
- public boolean isInclusive() {
- return delegate.includesLower() && delegate.includesUpper();
- }
-
- /** Returns the collator used to determine range inclusion, if any. */
- public Collator getCollator() {
- return delegate.getCollator();
- }
-
- /** Prints a user-readable version of this query. */
- public String toString(String field) {
- return delegate.toString(field);
- }
-
- /** Returns true iff o is equal to this. */
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof RangeQuery)) return false;
-
- final RangeQuery other = (RangeQuery) o;
- return this.delegate.equals(other.delegate);
- }
-
- /** Returns a hash code value for this object.*/
- public int hashCode() {
- return delegate.hashCode();
- }
-}
Index: src/test/org/apache/lucene/search/TestTermRangeQuery.java
===================================================================
--- src/test/org/apache/lucene/search/TestTermRangeQuery.java (revision 824118)
+++ src/test/org/apache/lucene/search/TestTermRangeQuery.java (working copy)
@@ -66,23 +66,6 @@
searcher.close();
}
- //TODO: remove in Lucene 3.0
- public void testDeprecatedCstrctors() throws IOException {
- Query query = new RangeQuery(null, new Term("content","C"), false);
- initializeIndex(new String[] {"A", "B", "C", "D"});
- IndexSearcher searcher = new IndexSearcher(dir, true);
- ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
- assertEquals("A,B,C,D, only B in range", 2, hits.length);
- searcher.close();
-
- query = new RangeQuery(new Term("content","C"),null, false);
- initializeIndex(new String[] {"A", "B", "C", "D"});
- searcher = new IndexSearcher(dir, true);
- hits = searcher.search(query, null, 1000).scoreDocs;
- assertEquals("A,B,C,D, only B in range", 1, hits.length);
- searcher.close();
- }
-
public void testInclusive() throws Exception {
Query query = new TermRangeQuery("content", "A", "C", true, true);