You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/10/07 03:18:31 UTC
svn commit: r1005310 - in /lucene/dev/trunk/lucene: CHANGES.txt
src/java/org/apache/lucene/search/MultiTermQuery.java
src/test/org/apache/lucene/search/TestFuzzyQuery.java
src/test/org/apache/lucene/search/TestTermRangeQuery.java
Author: rmuir
Date: Thu Oct 7 01:18:30 2010
New Revision: 1005310
URL: http://svn.apache.org/viewvc?rev=1005310&view=rev
Log:
LUCENE-2687: Remove pq trap in MultiTermQuery.TopTermsBooleanQueryRewrite
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1005310&r1=1005309&r2=1005310&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Oct 7 01:18:30 2010
@@ -682,8 +682,7 @@ Optimizations
* LUCENE-2123, LUCENE-2261: Move FuzzyQuery rewrite to separate RewriteMode
into MultiTermQuery. The number of fuzzy expansions can be specified with
- the maxExpansions parameter to FuzzyQuery, but the default is limited to
- BooleanQuery.maxClauseCount() as before.
+ the maxExpansions parameter to FuzzyQuery.
(Uwe Schindler, Robert Muir, Mike McCandless)
* LUCENE-2164: ConcurrentMergeScheduler has more control over merge
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java?rev=1005310&r1=1005309&r2=1005310&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/MultiTermQuery.java Thu Oct 7 01:18:30 2010
@@ -283,14 +283,6 @@ public abstract class MultiTermQuery ext
this.size = size;
}
- /**
- * Create a TopTermsBooleanQueryRewrite that is limited
- * to at most {@link BooleanQuery#getMaxClauseCount} terms.
- */
- public TopTermsBooleanQueryRewrite() {
- this(Integer.MAX_VALUE);
- }
-
/** Return a suitable Query for a MultiTermQuery term. */
protected abstract Query getQuery(Term term, int docCount);
@@ -380,14 +372,6 @@ public abstract class MultiTermQuery ext
TopTermsBooleanQueryRewrite {
/**
- * Create a TopTermsScoringBooleanQueryRewrite that is limited
- * to at most {@link BooleanQuery#getMaxClauseCount} terms.
- */
- public TopTermsScoringBooleanQueryRewrite() {
- super();
- }
-
- /**
* Create a TopTermsScoringBooleanQueryRewrite for
* at most <code>size</code> terms.
* <p>
@@ -418,14 +402,6 @@ public abstract class MultiTermQuery ext
TopTermsBooleanQueryRewrite {
/**
- * Create a TopTermsBoostOnlyBooleanQueryRewrite that is limited
- * to at most {@link BooleanQuery#getMaxClauseCount} terms.
- */
- public TopTermsBoostOnlyBooleanQueryRewrite() {
- super();
- }
-
- /**
* Create a TopTermsBoostOnlyBooleanQueryRewrite for
* at most <code>size</code> terms.
* <p>
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=1005310&r1=1005309&r2=1005310&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java Thu Oct 7 01:18:30 2010
@@ -329,7 +329,7 @@ public class TestFuzzyQuery extends Luce
writer.close();
FuzzyQuery query = new FuzzyQuery(new Term("field", "lucene"));
- query.setRewriteMethod(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite());
+ query.setRewriteMethod(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(50));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(3, hits.length);
// normally, 'Lucenne' would be the first result as IDF will skew the score.
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1005310&r1=1005309&r2=1005310&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java Thu Oct 7 01:18:30 2010
@@ -138,7 +138,7 @@ public class TestTermRangeQuery extends
}
private void checkBooleanTerms(Searcher searcher, TermRangeQuery query, String... terms) throws IOException {
- query.setRewriteMethod(new MultiTermQuery.TopTermsScoringBooleanQueryRewrite());
+ query.setRewriteMethod(new MultiTermQuery.TopTermsScoringBooleanQueryRewrite(50));
final BooleanQuery bq = (BooleanQuery) searcher.rewrite(query);
final Set<String> allowedTerms = new HashSet<String>(Arrays.asList(terms));
assertEquals(allowedTerms.size(), bq.clauses().size());