Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-6286: Removed IndexSearcher methods that take a Filter object. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1662059 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrien Grand 2015-02-24 17:43:10 +00:00
parent 612e4544ef
commit 2cd3fb807d
124 changed files with 759 additions and 864 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -156,6 +156,9 @@ API Changes
performance would be achieved through CollationKeyAnalyzer or performance would be achieved through CollationKeyAnalyzer or
ICUCollationKeyAnalyzer. (Adrien Grand) ICUCollationKeyAnalyzer. (Adrien Grand)
* LUCENE-6286: Removed IndexSearcher methods that take a Filter object.
A BooleanQuery with a filter clause must be used instead. (Adrien Grand)
Other Other
* LUCENE-6248: Remove unused odd constants from StandardSyntaxParser.jj * LUCENE-6248: Remove unused odd constants from StandardSyntaxParser.jj

4
lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
View File

@ -114,7 +114,7 @@ public class ShingleAnalyzerWrapperTest extends BaseTokenStreamTestCase {
ts.end(); ts.end();
} }
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
int[] ranks = new int[] { 0 }; int[] ranks = new int[] { 0 };
compareRanks(hits, ranks); compareRanks(hits, ranks);
} }
@ -139,7 +139,7 @@ public class ShingleAnalyzerWrapperTest extends BaseTokenStreamTestCase {
ts.end(); ts.end();
} }
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
int[] ranks = new int[] { 1, 2, 0 }; int[] ranks = new int[] { 1, 2, 0 };
compareRanks(hits, ranks); compareRanks(hits, ranks);
} }

20
lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
View File

@ -729,7 +729,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
} }
} }
ScoreDoc[] hits = searcher.search(new TermQuery(new Term(new String("content"), "aaa")), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(new Term(new String("content"), "aaa")), 1000).scoreDocs;
// First document should be #0 // First document should be #0
StoredDocument d = searcher.getIndexReader().document(hits[0].doc); StoredDocument d = searcher.getIndexReader().document(hits[0].doc);
@ -738,20 +738,20 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
doTestHits(hits, 34, searcher.getIndexReader()); doTestHits(hits, 34, searcher.getIndexReader());
if (is40Index) { if (is40Index) {
hits = searcher.search(new TermQuery(new Term(new String("content5"), "aaa")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term(new String("content5"), "aaa")), 1000).scoreDocs;
doTestHits(hits, 34, searcher.getIndexReader()); doTestHits(hits, 34, searcher.getIndexReader());
hits = searcher.search(new TermQuery(new Term(new String("content6"), "aaa")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term(new String("content6"), "aaa")), 1000).scoreDocs;
doTestHits(hits, 34, searcher.getIndexReader()); doTestHits(hits, 34, searcher.getIndexReader());
} }
hits = searcher.search(new TermQuery(new Term("utf8", "\u0000")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term("utf8", "\u0000")), 1000).scoreDocs;
assertEquals(34, hits.length); assertEquals(34, hits.length);
hits = searcher.search(new TermQuery(new Term(new String("utf8"), "lu\uD834\uDD1Ece\uD834\uDD60ne")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term(new String("utf8"), "lu\uD834\uDD1Ece\uD834\uDD60ne")), 1000).scoreDocs;
assertEquals(34, hits.length); assertEquals(34, hits.length);
hits = searcher.search(new TermQuery(new Term("utf8", "ab\ud917\udc17cd")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term("utf8", "ab\ud917\udc17cd")), 1000).scoreDocs;
assertEquals(34, hits.length); assertEquals(34, hits.length);
reader.close(); reader.close();
@ -775,7 +775,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
// make sure searching sees right # hits // make sure searching sees right # hits
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(new Term("content", "aaa")), 1000).scoreDocs;
StoredDocument d = searcher.getIndexReader().document(hits[0].doc); StoredDocument d = searcher.getIndexReader().document(hits[0].doc);
assertEquals("wrong first document", "0", d.get("id")); assertEquals("wrong first document", "0", d.get("id"));
doTestHits(hits, 44, searcher.getIndexReader()); doTestHits(hits, 44, searcher.getIndexReader());
@ -790,7 +790,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term("content", "aaa")), 1000).scoreDocs;
assertEquals("wrong number of hits", 44, hits.length); assertEquals("wrong number of hits", 44, hits.length);
d = searcher.doc(hits[0].doc); d = searcher.doc(hits[0].doc);
doTestHits(hits, 44, searcher.getIndexReader()); doTestHits(hits, 44, searcher.getIndexReader());
@ -802,7 +802,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
// make sure searching sees right # hits // make sure searching sees right # hits
DirectoryReader reader = DirectoryReader.open(dir); DirectoryReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(new Term("content", "aaa")), 1000).scoreDocs;
assertEquals("wrong number of hits", 34, hits.length); assertEquals("wrong number of hits", 34, hits.length);
StoredDocument d = searcher.doc(hits[0].doc); StoredDocument d = searcher.doc(hits[0].doc);
assertEquals("wrong first document", "0", d.get("id")); assertEquals("wrong first document", "0", d.get("id"));
@ -816,7 +816,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(new Term("content", "aaa")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term("content", "aaa")), 1000).scoreDocs;
assertEquals("wrong number of hits", 34, hits.length); assertEquals("wrong number of hits", 34, hits.length);
doTestHits(hits, 34, searcher.getIndexReader()); doTestHits(hits, 34, searcher.getIndexReader());
reader.close(); reader.close();

4
lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
View File

@ -124,14 +124,14 @@ public abstract class ReadTask extends PerfTask {
TopFieldCollector collector = TopFieldCollector.create(sort, numHits, TopFieldCollector collector = TopFieldCollector.create(sort, numHits,
true, withScore(), true, withScore(),
withMaxScore()); withMaxScore());
searcher.search(q, null, collector); searcher.search(q, collector);
hits = collector.topDocs(); hits = collector.topDocs();
} else { } else {
hits = searcher.search(q, numHits); hits = searcher.search(q, numHits);
} }
} else { } else {
Collector collector = createCollector(); Collector collector = createCollector();
searcher.search(q, null, collector); searcher.search(q, collector);
//hits = collector.topDocs(); //hits = collector.topDocs();
} }

2
lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityBenchmark.java
View File

@ -94,7 +94,7 @@ public class QualityBenchmark {
Query q = qqParser.parse(qq); Query q = qqParser.parse(qq);
// search with this query // search with this query
long t1 = System.currentTimeMillis(); long t1 = System.currentTimeMillis();
TopDocs td = searcher.search(q,null,maxResults); TopDocs td = searcher.search(q,maxResults);
long searchTime = System.currentTimeMillis()-t1; long searchTime = System.currentTimeMillis()-t1;
//most likely we either submit or judge, but check both //most likely we either submit or judge, but check both
if (judge!=null) { if (judge!=null) {

2
lucene/core/src/java/org/apache/lucene/search/FieldDoc.java
View File

@ -46,7 +46,7 @@ public class FieldDoc extends ScoreDoc {
* the <code>value</code> method corresponding * the <code>value</code> method corresponding
* FieldComparator used to sort this field. * FieldComparator used to sort this field.
* @see Sort * @see Sort
* @see IndexSearcher#search(Query,Filter,int,Sort) * @see IndexSearcher#search(Query,int,Sort)
*/ */
public Object[] fields; public Object[] fields;

4
lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java
View File

@ -27,7 +27,7 @@ import org.apache.lucene.util.PriorityQueue;
* *
* @lucene.experimental * @lucene.experimental
* @since 2.9 * @since 2.9
* @see IndexSearcher#search(Query,Filter,int,Sort) * @see IndexSearcher#search(Query,int,Sort)
*/ */
public abstract class FieldValueHitQueue<T extends FieldValueHitQueue.Entry> extends PriorityQueue<T> { public abstract class FieldValueHitQueue<T extends FieldValueHitQueue.Entry> extends PriorityQueue<T> {
@ -202,7 +202,7 @@ public abstract class FieldValueHitQueue<T extends FieldValueHitQueue.Entry> ext
* *
* @param entry The Entry used to create a FieldDoc * @param entry The Entry used to create a FieldDoc
* @return The newly created FieldDoc * @return The newly created FieldDoc
* @see IndexSearcher#search(Query,Filter,int,Sort) * @see IndexSearcher#search(Query,int,Sort)
*/ */
FieldDoc fillFields(final Entry entry) { FieldDoc fillFields(final Entry entry) {
final int n = comparators.length; final int n = comparators.length;

106
lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
View File

@ -47,8 +47,7 @@ import org.apache.lucene.util.ThreadInterruptedException;
/** Implements search over a single IndexReader. /** Implements search over a single IndexReader.
* *
* <p>Applications usually need only call the inherited * <p>Applications usually need only call the inherited
* {@link #search(Query,int)} * {@link #search(Query,int)} method. For
* or {@link #search(Query,Filter,int)} methods. For
* performance reasons, if your index is unchanging, you * performance reasons, if your index is unchanging, you
* should share a single IndexSearcher instance across * should share a single IndexSearcher instance across
* multiple searches instead of creating a new one * multiple searches instead of creating a new one
@ -210,11 +209,6 @@ public class IndexSearcher {
return similarity; return similarity;
} }
/** @lucene.internal */
protected Query wrapFilter(Query query, Filter filter) {
return (filter == null) ? query : new FilteredQuery(query, filter);
}
/** Finds the top <code>n</code> /** Finds the top <code>n</code>
* hits for <code>query</code> where all results are after a previous * hits for <code>query</code> where all results are after a previous
* result (<code>after</code>). * result (<code>after</code>).
@ -275,21 +269,6 @@ public class IndexSearcher {
} }
} }
/** Finds the top <code>n</code>
* hits for <code>query</code>, applying <code>filter</code> if non-null,
* where all results are after a previous result (<code>after</code>).
* <p>
* By passing the bottom result from a previous page as <code>after</code>,
* this method can be used for efficient 'deep-paging' across potentially
* large result sets.
*
* @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses.
*/
public TopDocs searchAfter(ScoreDoc after, Query query, Filter filter, int n) throws IOException {
return searchAfter(after, wrapFilter(query, filter), n);
}
/** Finds the top <code>n</code> /** Finds the top <code>n</code>
* hits for <code>query</code>. * hits for <code>query</code>.
* *
@ -301,34 +280,6 @@ public class IndexSearcher {
return searchAfter(null, query, n); return searchAfter(null, query, n);
} }
/** Finds the top <code>n</code>
* hits for <code>query</code>, applying <code>filter</code> if non-null.
*
* @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses.
*/
public TopDocs search(Query query, Filter filter, int n)
throws IOException {
return search(wrapFilter(query, filter), n);
}
/** Lower-level search API.
*
* <p>{@link LeafCollector#collect(int)} is called for every matching
* document.
*
* @param query to match documents
* @param filter if non-null, used to permit documents to be collected.
* @param results to receive hits
* @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses.
*/
public void search(Query query, Filter filter, Collector results)
throws IOException {
search(wrapFilter(query, filter), results);
}
/** Lower-level search API. /** Lower-level search API.
* *
* <p>{@link LeafCollector#collect(int)} is called for every matching document. * <p>{@link LeafCollector#collect(int)} is called for every matching document.
@ -341,29 +292,12 @@ public class IndexSearcher {
search(leafContexts, createNormalizedWeight(query, results.needsScores()), results); search(leafContexts, createNormalizedWeight(query, results.needsScores()), results);
} }
/** Search implementation with arbitrary sorting. Finds
* the top <code>n</code> hits for <code>query</code>, applying
* <code>filter</code> if non-null, and sorting the hits by the criteria in
* <code>sort</code>.
*
* <p>NOTE: this does not compute scores by default; use
* {@link IndexSearcher#search(Query,Filter,int,Sort,boolean,boolean)} to
* control scoring.
*
* @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses.
*/
public TopFieldDocs search(Query query, Filter filter, int n,
Sort sort) throws IOException {
return search(query, filter, n, sort, false, false);
}
/** Search implementation with arbitrary sorting, plus /** Search implementation with arbitrary sorting, plus
* control over whether hit scores and max score * control over whether hit scores and max score
* should be computed. Finds * should be computed. Finds
* the top <code>n</code> hits for <code>query</code>, applying * the top <code>n</code> hits for <code>query</code>, and sorting
* <code>filter</code> if non-null, and sorting the hits by the criteria in * the hits by the criteria in <code>sort</code>.
* <code>sort</code>. If <code>doDocScores</code> is <code>true</code> * If <code>doDocScores</code> is <code>true</code>
* then the score of each hit will be computed and * then the score of each hit will be computed and
* returned. If <code>doMaxScore</code> is * returned. If <code>doMaxScore</code> is
* <code>true</code> then the maximum score over all * <code>true</code> then the maximum score over all
@ -372,37 +306,21 @@ public class IndexSearcher {
* @throws BooleanQuery.TooManyClauses If a query would exceed * @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses. * {@link BooleanQuery#getMaxClauseCount()} clauses.
*/ */
public TopFieldDocs search(Query query, Filter filter, int n, public TopFieldDocs search(Query query, int n,
Sort sort, boolean doDocScores, boolean doMaxScore) throws IOException { Sort sort, boolean doDocScores, boolean doMaxScore) throws IOException {
return searchAfter(null, query, filter, n, sort, doDocScores, doMaxScore); return searchAfter(null, query, n, sort, doDocScores, doMaxScore);
}
/** Finds the top <code>n</code>
* hits for <code>query</code>, applying <code>filter</code> if non-null,
* where all results are after a previous result (<code>after</code>).
* <p>
* By passing the bottom result from a previous page as <code>after</code>,
* this method can be used for efficient 'deep-paging' across potentially
* large result sets.
*
* @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses.
*/
public TopFieldDocs searchAfter(ScoreDoc after, Query query, Filter filter, int n, Sort sort) throws IOException {
return searchAfter(after, query, filter, n, sort, false, false);
} }
/** /**
* Search implementation with arbitrary sorting and no filter. * Search implementation with arbitrary sorting.
* @param query The query to search for * @param query The query to search for
* @param n Return only the top n results * @param n Return only the top n results
* @param sort The {@link org.apache.lucene.search.Sort} object * @param sort The {@link org.apache.lucene.search.Sort} object
* @return The top docs, sorted according to the supplied {@link org.apache.lucene.search.Sort} instance * @return The top docs, sorted according to the supplied {@link org.apache.lucene.search.Sort} instance
* @throws IOException if there is a low-level I/O error * @throws IOException if there is a low-level I/O error
*/ */
public TopFieldDocs search(Query query, int n, public TopFieldDocs search(Query query, int n, Sort sort) throws IOException {
Sort sort) throws IOException { return searchAfter(null, query, n, sort, false, false);
return search(query, null, n, sort, false, false);
} }
/** Finds the top <code>n</code> /** Finds the top <code>n</code>
@ -417,7 +335,7 @@ public class IndexSearcher {
* {@link BooleanQuery#getMaxClauseCount()} clauses. * {@link BooleanQuery#getMaxClauseCount()} clauses.
*/ */
public TopDocs searchAfter(ScoreDoc after, Query query, int n, Sort sort) throws IOException { public TopDocs searchAfter(ScoreDoc after, Query query, int n, Sort sort) throws IOException {
return searchAfter(after, query, null, n, sort, false, false); return searchAfter(after, query, n, sort, false, false);
} }
/** Finds the top <code>n</code> /** Finds the top <code>n</code>
@ -436,14 +354,14 @@ public class IndexSearcher {
* @throws BooleanQuery.TooManyClauses If a query would exceed * @throws BooleanQuery.TooManyClauses If a query would exceed
* {@link BooleanQuery#getMaxClauseCount()} clauses. * {@link BooleanQuery#getMaxClauseCount()} clauses.
*/ */
public TopFieldDocs searchAfter(ScoreDoc after, Query query, Filter filter, int numHits, Sort sort, public TopFieldDocs searchAfter(ScoreDoc after, Query query, int numHits, Sort sort,
boolean doDocScores, boolean doMaxScore) throws IOException { boolean doDocScores, boolean doMaxScore) throws IOException {
if (after != null && !(after instanceof FieldDoc)) { if (after != null && !(after instanceof FieldDoc)) {
// TODO: if we fix type safety of TopFieldDocs we can // TODO: if we fix type safety of TopFieldDocs we can
// remove this // remove this
throw new IllegalArgumentException("after must be a FieldDoc; got " + after); throw new IllegalArgumentException("after must be a FieldDoc; got " + after);
} }
return searchAfter((FieldDoc) after, wrapFilter(query, filter), numHits, sort, doDocScores, doMaxScore); return searchAfter((FieldDoc) after, query, numHits, sort, doDocScores, doMaxScore);
} }
private TopFieldDocs searchAfter(FieldDoc after, Query query, int numHits, Sort sort, private TopFieldDocs searchAfter(FieldDoc after, Query query, int numHits, Sort sort,

1
lucene/core/src/java/org/apache/lucene/search/TopDocs.java
View File

@ -22,7 +22,6 @@ import org.apache.lucene.util.PriorityQueue;
import java.io.IOException; import java.io.IOException;
/** Represents hits returned by {@link /** Represents hits returned by {@link
* IndexSearcher#search(Query,Filter,int)} and {@link
* IndexSearcher#search(Query,int)}. */ * IndexSearcher#search(Query,int)}. */
public class TopDocs { public class TopDocs {

2
lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java
View File

@ -19,7 +19,7 @@ package org.apache.lucene.search;
/** Represents hits returned by {@link /** Represents hits returned by {@link
* IndexSearcher#search(Query,Filter,int,Sort)}. * IndexSearcher#search(Query,int,Sort)}.
*/ */
public class TopFieldDocs extends TopDocs { public class TopFieldDocs extends TopDocs {

3
lucene/core/src/java/org/apache/lucene/search/package-info.java
View File

@ -40,8 +40,7 @@
* on implementing your own Query class, see <a href="#customQueriesExpert">Custom Queries -- Expert Level</a> below. * on implementing your own Query class, see <a href="#customQueriesExpert">Custom Queries -- Expert Level</a> below.
* <p> * <p>
* To perform a search, applications usually call {@link * To perform a search, applications usually call {@link
* org.apache.lucene.search.IndexSearcher#search(Query,int)} or {@link * org.apache.lucene.search.IndexSearcher#search(Query,int)}.
* org.apache.lucene.search.IndexSearcher#search(Query,Filter,int)}.
* <p> * <p>
* Once a Query has been created and submitted to the {@link org.apache.lucene.search.IndexSearcher IndexSearcher}, the scoring * Once a Query has been created and submitted to the {@link org.apache.lucene.search.IndexSearcher IndexSearcher}, the scoring
* process begins. After some infrastructure setup, control finally passes to the {@link org.apache.lucene.search.Weight Weight} * process begins. After some infrastructure setup, control finally passes to the {@link org.apache.lucene.search.Weight Weight}

4
lucene/core/src/test/org/apache/lucene/TestDemo.java
View File

@ -61,7 +61,7 @@ public class TestDemo extends LuceneTestCase {
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits); assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
Query query = new TermQuery(new Term("fieldname", "text")); Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, null, 1); TopDocs hits = isearcher.search(query, 1);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
// Iterate through the results: // Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) { for (int i = 0; i < hits.scoreDocs.length; i++) {
@ -73,7 +73,7 @@ public class TestDemo extends LuceneTestCase {
PhraseQuery phraseQuery = new PhraseQuery(); PhraseQuery phraseQuery = new PhraseQuery();
phraseQuery.add(new Term("fieldname", "to")); phraseQuery.add(new Term("fieldname", "to"));
phraseQuery.add(new Term("fieldname", "be")); phraseQuery.add(new Term("fieldname", "be"));
assertEquals(1, isearcher.search(phraseQuery, null, 1).totalHits); assertEquals(1, isearcher.search(phraseQuery, 1).totalHits);
ireader.close(); ireader.close();
directory.close(); directory.close();

4
lucene/core/src/test/org/apache/lucene/TestSearch.java
View File

@ -57,7 +57,7 @@ public class TestSearch extends LuceneTestCase {
try { try {
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
assertTrue("score is not negative: " + hits[0].score, assertTrue("score is not negative: " + hits[0].score,
hits[0].score < 0); hits[0].score < 0);
@ -147,7 +147,7 @@ public class TestSearch extends LuceneTestCase {
System.out.println("TEST: query=" + query); System.out.println("TEST: query=" + query);
} }
hits = searcher.search(query, null, 1000, sort).scoreDocs; hits = searcher.search(query, 1000, sort).scoreDocs;
out.println(hits.length + " total results"); out.println(hits.length + " total results");
for (int i = 0 ; i < hits.length && i < 10; i++) { for (int i = 0 ; i < hits.length && i < 10; i++) {

4
lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java
View File

@ -117,7 +117,7 @@ public class TestSearchForDuplicates extends LuceneTestCase {
final Sort sort = new Sort(SortField.FIELD_SCORE, final Sort sort = new Sort(SortField.FIELD_SCORE,
new SortField(ID_FIELD, SortField.Type.INT)); new SortField(ID_FIELD, SortField.Type.INT));
ScoreDoc[] hits = searcher.search(query, null, MAX_DOCS, sort).scoreDocs; ScoreDoc[] hits = searcher.search(query, MAX_DOCS, sort).scoreDocs;
printHits(out, hits, searcher); printHits(out, hits, searcher);
checkHits(hits, MAX_DOCS, searcher); checkHits(hits, MAX_DOCS, searcher);
@ -130,7 +130,7 @@ public class TestSearchForDuplicates extends LuceneTestCase {
booleanQuery.add(new TermQuery(new Term(PRIORITY_FIELD, MED_PRIORITY)), BooleanClause.Occur.SHOULD); booleanQuery.add(new TermQuery(new Term(PRIORITY_FIELD, MED_PRIORITY)), BooleanClause.Occur.SHOULD);
out.println("Query: " + booleanQuery.toString(PRIORITY_FIELD)); out.println("Query: " + booleanQuery.toString(PRIORITY_FIELD));
hits = searcher.search(booleanQuery, null, MAX_DOCS, sort).scoreDocs; hits = searcher.search(booleanQuery, MAX_DOCS, sort).scoreDocs;
printHits(out, hits, searcher); printHits(out, hits, searcher);
checkHits(hits, MAX_DOCS, searcher); checkHits(hits, MAX_DOCS, searcher);

2
lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
View File

@ -107,7 +107,7 @@ public class TestPerFieldDocValuesFormat extends BaseDocValuesFormatTestCase {
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits); assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
Query query = new TermQuery(new Term("fieldname", "text")); Query query = new TermQuery(new Term("fieldname", "text"));
TopDocs hits = isearcher.search(query, null, 1); TopDocs hits = isearcher.search(query, 1);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
// Iterate through the results: // Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) { for (int i = 0; i < hits.scoreDocs.length; i++) {

6
lucene/core/src/test/org/apache/lucene/document/TestDocument.java
View File

@ -218,7 +218,7 @@ public class TestDocument extends LuceneTestCase {
Query query = new TermQuery(new Term("keyword", "test1")); Query query = new TermQuery(new Term("keyword", "test1"));
// ensure that queries return expected results without DateFilter first // ensure that queries return expected results without DateFilter first
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
doAssert(searcher.doc(hits[0].doc)); doAssert(searcher.doc(hits[0].doc));
@ -250,7 +250,7 @@ public class TestDocument extends LuceneTestCase {
query.add(new Term("indexed_not_tokenized", "test1")); query.add(new Term("indexed_not_tokenized", "test1"));
query.add(new Term("indexed_not_tokenized", "test2")); query.add(new Term("indexed_not_tokenized", "test2"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
doAssert(searcher.doc(hits[0].doc)); doAssert(searcher.doc(hits[0].doc));
@ -332,7 +332,7 @@ public class TestDocument extends LuceneTestCase {
Query query = new TermQuery(new Term("keyword", "test")); Query query = new TermQuery(new Term("keyword", "test"));
// ensure that queries return expected results without DateFilter first // ensure that queries return expected results without DateFilter first
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
int result = 0; int result = 0;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {

11
lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
View File

@ -304,17 +304,6 @@ public class TestCodecs extends LuceneTestCase {
dir.close(); dir.close();
} }
private ScoreDoc[] search(final IndexWriter writer, final Query q, final int n) throws IOException {
final IndexReader reader = writer.getReader();
final IndexSearcher searcher = newSearcher(reader);
try {
return searcher.search(q, null, n).scoreDocs;
}
finally {
reader.close();
}
}
private class Verify extends Thread { private class Verify extends Thread {
final Fields termsDict; final Fields termsDict;
final FieldData[] fields; final FieldData[] fields;

6
lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java
View File

@ -672,7 +672,7 @@ public class TestDeletionPolicy extends LuceneTestCase {
writer.close(); writer.close();
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(16, hits.length); assertEquals(16, hits.length);
reader.close(); reader.close();
@ -690,7 +690,7 @@ public class TestDeletionPolicy extends LuceneTestCase {
IndexReader rwReader = DirectoryReader.open(dir); IndexReader rwReader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(rwReader); IndexSearcher searcher = newSearcher(rwReader);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// Simplistic check: just verify only the past N segments_N's still // Simplistic check: just verify only the past N segments_N's still
@ -708,7 +708,7 @@ public class TestDeletionPolicy extends LuceneTestCase {
// Work backwards in commits on what the expected // Work backwards in commits on what the expected
// count should be. // count should be.
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(expectedCount, hits.length); assertEquals(expectedCount, hits.length);
if (expectedCount == 0) { if (expectedCount == 0) {
expectedCount = 16; expectedCount = 16;

2
lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java
View File

@ -272,7 +272,7 @@ public class TestDirectoryReaderReopen extends LuceneTestCase {
IndexSearcher searcher = newSearcher(refreshed); IndexSearcher searcher = newSearcher(refreshed);
ScoreDoc[] hits = searcher.search( ScoreDoc[] hits = searcher.search(
new TermQuery(new Term("field1", "a" + rnd.nextInt(refreshed.maxDoc()))), new TermQuery(new Term("field1", "a" + rnd.nextInt(refreshed.maxDoc()))),
null, 1000).scoreDocs; 1000).scoreDocs;
if (hits.length > 0) { if (hits.length > 0) {
searcher.doc(hits[0].doc); searcher.doc(hits[0].doc);
} }

4
lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
View File

@ -444,7 +444,7 @@ public class TestIndexWriter extends LuceneTestCase {
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals(10, hits.length); assertEquals(10, hits.length);
reader.close(); reader.close();
@ -466,7 +466,7 @@ public class TestIndexWriter extends LuceneTestCase {
writer.close(); writer.close();
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals(27, hits.length); assertEquals(27, hits.length);
reader.close(); reader.close();

16
lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
View File

@ -52,7 +52,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
Term searchTerm = new Term("content", "aaa"); Term searchTerm = new Term("content", "aaa");
DirectoryReader reader = DirectoryReader.open(dir); DirectoryReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("first number of hits", 14, hits.length); assertEquals("first number of hits", 14, hits.length);
reader.close(); reader.close();
@ -65,7 +65,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
} }
IndexReader r = DirectoryReader.open(dir); IndexReader r = DirectoryReader.open(dir);
searcher = newSearcher(r); searcher = newSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("reader incorrectly sees changes from writer", 14, hits.length); assertEquals("reader incorrectly sees changes from writer", 14, hits.length);
r.close(); r.close();
assertTrue("reader should have still been current", reader.isCurrent()); assertTrue("reader should have still been current", reader.isCurrent());
@ -77,7 +77,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
IndexReader r = DirectoryReader.open(dir); IndexReader r = DirectoryReader.open(dir);
searcher = newSearcher(r); searcher = newSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("reader did not see changes after writer was closed", 47, hits.length); assertEquals("reader did not see changes after writer was closed", 47, hits.length);
r.close(); r.close();
reader.close(); reader.close();
@ -108,7 +108,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
Term searchTerm = new Term("content", "aaa"); Term searchTerm = new Term("content", "aaa");
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("first number of hits", 14, hits.length); assertEquals("first number of hits", 14, hits.length);
reader.close(); reader.close();
@ -123,7 +123,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("reader incorrectly sees changes from writer", 14, hits.length); assertEquals("reader incorrectly sees changes from writer", 14, hits.length);
reader.close(); reader.close();
@ -134,7 +134,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("saw changes after writer.abort", 14, hits.length); assertEquals("saw changes after writer.abort", 14, hits.length);
reader.close(); reader.close();
@ -156,7 +156,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
} }
IndexReader r = DirectoryReader.open(dir); IndexReader r = DirectoryReader.open(dir);
searcher = newSearcher(r); searcher = newSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("reader incorrectly sees changes from writer", 14, hits.length); assertEquals("reader incorrectly sees changes from writer", 14, hits.length);
r.close(); r.close();
} }
@ -164,7 +164,7 @@ public class TestIndexWriterCommit extends LuceneTestCase {
writer.close(); writer.close();
IndexReader r = DirectoryReader.open(dir); IndexReader r = DirectoryReader.open(dir);
searcher = newSearcher(r); searcher = newSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("didn't see changes after close", 218, hits.length); assertEquals("didn't see changes after close", 218, hits.length);
r.close(); r.close();

4
lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
View File

@ -473,7 +473,7 @@ public class TestIndexWriterDelete extends LuceneTestCase {
private int getHitCount(Directory dir, Term term) throws IOException { private int getHitCount(Directory dir, Term term) throws IOException {
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
int hitCount = searcher.search(new TermQuery(term), null, 1000).totalHits; int hitCount = searcher.search(new TermQuery(term), 1000).totalHits;
reader.close(); reader.close();
return hitCount; return hitCount;
} }
@ -656,7 +656,7 @@ public class TestIndexWriterDelete extends LuceneTestCase {
IndexSearcher searcher = newSearcher(newReader); IndexSearcher searcher = newSearcher(newReader);
ScoreDoc[] hits = null; ScoreDoc[] hits = null;
try { try {
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
} }
catch (IOException e) { catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

2
lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
View File

@ -67,7 +67,7 @@ public class TestIndexWriterMaxDocs extends LuceneTestCase {
assertEquals(IndexWriter.MAX_DOCS, hits.totalHits); assertEquals(IndexWriter.MAX_DOCS, hits.totalHits);
// Sort by docID reversed: // Sort by docID reversed:
hits = searcher.search(new TermQuery(new Term("field", "text")), null, 10, new Sort(new SortField(null, SortField.Type.DOC, true))); hits = searcher.search(new TermQuery(new Term("field", "text")), 10, new Sort(new SortField(null, SortField.Type.DOC, true)));
assertEquals(IndexWriter.MAX_DOCS, hits.totalHits); assertEquals(IndexWriter.MAX_DOCS, hits.totalHits);
assertEquals(10, hits.scoreDocs.length); assertEquals(10, hits.scoreDocs.length);
assertEquals(IndexWriter.MAX_DOCS-1, hits.scoreDocs[0].doc); assertEquals(IndexWriter.MAX_DOCS-1, hits.scoreDocs[0].doc);

4
lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
View File

@ -202,7 +202,7 @@ public class TestIndexWriterOnDiskFull extends LuceneTestCase {
assertEquals("first docFreq", 57, reader.docFreq(searchTerm)); assertEquals("first docFreq", 57, reader.docFreq(searchTerm));
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(searchTerm), 1000).scoreDocs;
assertEquals("first number of hits", 57, hits.length); assertEquals("first number of hits", 57, hits.length);
reader.close(); reader.close();
@ -396,7 +396,7 @@ public class TestIndexWriterOnDiskFull extends LuceneTestCase {
searcher = newSearcher(reader); searcher = newSearcher(reader);
try { try {
hits = searcher.search(new TermQuery(searchTerm), null, END_COUNT).scoreDocs; hits = searcher.search(new TermQuery(searchTerm), END_COUNT).scoreDocs;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(System.out); e.printStackTrace(System.out);
fail(testName + ": exception when searching: " + e); fail(testName + ": exception when searching: " + e);

2
lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
View File

@ -114,7 +114,7 @@ public class TestLazyProxSkipping extends LuceneTestCase {
PhraseQuery pq = new PhraseQuery(); PhraseQuery pq = new PhraseQuery();
pq.add(new Term(this.field, this.term1)); pq.add(new Term(this.field, this.term1));
pq.add(new Term(this.field, this.term2)); pq.add(new Term(this.field, this.term2));
return this.searcher.search(pq, null, 1000).scoreDocs; return this.searcher.search(pq, 1000).scoreDocs;
} }
private void performTest(int numHits) throws IOException { private void performTest(int numHits) throws IOException {

2
lucene/core/src/test/org/apache/lucene/index/TestManyFields.java
View File

@ -107,7 +107,7 @@ public class TestManyFields extends LuceneTestCase {
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
int totalHits = searcher.search(new TermQuery(new Term("field", "aaa")), null, 1).totalHits; int totalHits = searcher.search(new TermQuery(new Term("field", "aaa")), 1).totalHits;
assertEquals(n*100, totalHits); assertEquals(n*100, totalHits);
reader.close(); reader.close();

4
lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java
View File

@ -402,8 +402,8 @@ public class TestParallelCompositeReader extends LuceneTestCase {
} }
private void queryTest(Query query) throws IOException { private void queryTest(Query query) throws IOException {
ScoreDoc[] parallelHits = parallel.search(query, null, 1000).scoreDocs; ScoreDoc[] parallelHits = parallel.search(query, 1000).scoreDocs;
ScoreDoc[] singleHits = single.search(query, null, 1000).scoreDocs; ScoreDoc[] singleHits = single.search(query, 1000).scoreDocs;
assertEquals(parallelHits.length, singleHits.length); assertEquals(parallelHits.length, singleHits.length);
for(int i = 0; i < parallelHits.length; i++) { for(int i = 0; i < parallelHits.length; i++) {
assertEquals(parallelHits[i].score, singleHits[i].score, 0.001f); assertEquals(parallelHits[i].score, singleHits[i].score, 0.001f);

4
lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java
View File

@ -244,8 +244,8 @@ public class TestParallelLeafReader extends LuceneTestCase {
} }
private void queryTest(Query query) throws IOException { private void queryTest(Query query) throws IOException {
ScoreDoc[] parallelHits = parallel.search(query, null, 1000).scoreDocs; ScoreDoc[] parallelHits = parallel.search(query, 1000).scoreDocs;
ScoreDoc[] singleHits = single.search(query, null, 1000).scoreDocs; ScoreDoc[] singleHits = single.search(query, 1000).scoreDocs;
assertEquals(parallelHits.length, singleHits.length); assertEquals(parallelHits.length, singleHits.length);
for(int i = 0; i < parallelHits.length; i++) { for(int i = 0; i < parallelHits.length; i++) {
assertEquals(parallelHits[i].score, singleHits[i].score, 0.001f); assertEquals(parallelHits[i].score, singleHits[i].score, 0.001f);

8
lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
View File

@ -132,11 +132,11 @@ public class TestBoolean2 extends LuceneTestCase {
// sometimes return a default impl around the scorer so that we can // sometimes return a default impl around the scorer so that we can
// compare BS1 and BS2 // compare BS1 and BS2
TopScoreDocCollector collector = TopScoreDocCollector.create(1000); TopScoreDocCollector collector = TopScoreDocCollector.create(1000);
searcher.search(query, null, collector); searcher.search(query, collector);
ScoreDoc[] hits1 = collector.topDocs().scoreDocs; ScoreDoc[] hits1 = collector.topDocs().scoreDocs;
collector = TopScoreDocCollector.create(1000); collector = TopScoreDocCollector.create(1000);
searcher.search(query, null, collector); searcher.search(query, collector);
ScoreDoc[] hits2 = collector.topDocs().scoreDocs; ScoreDoc[] hits2 = collector.topDocs().scoreDocs;
assertEquals(mulFactor * collector.totalHits, assertEquals(mulFactor * collector.totalHits,
@ -285,13 +285,13 @@ public class TestBoolean2 extends LuceneTestCase {
TopFieldCollector collector = TopFieldCollector.create(sort, 1000, TopFieldCollector collector = TopFieldCollector.create(sort, 1000,
false, true, true); false, true, true);
searcher.search(q1, null, collector); searcher.search(q1, collector);
ScoreDoc[] hits1 = collector.topDocs().scoreDocs; ScoreDoc[] hits1 = collector.topDocs().scoreDocs;
collector = TopFieldCollector.create(sort, 1000, collector = TopFieldCollector.create(sort, 1000,
false, true, true); false, true, true);
searcher.search(q1, null, collector); searcher.search(q1, collector);
ScoreDoc[] hits2 = collector.topDocs().scoreDocs; ScoreDoc[] hits2 = collector.topDocs().scoreDocs;
tot+=hits2.length; tot+=hits2.length;
CheckHits.checkEqual(q1, hits1, hits2); CheckHits.checkEqual(q1, hits1, hits2);

14
lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
View File

@ -87,7 +87,7 @@ public class TestBooleanMinShouldMatch extends LuceneTestCase {
public void verifyNrHits(Query q, int expected) throws Exception { public void verifyNrHits(Query q, int expected) throws Exception {
// bs1 // bs1
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
if (expected != h.length) { if (expected != h.length) {
printHits(getTestName(), h, s); printHits(getTestName(), h, s);
} }
@ -349,8 +349,8 @@ public class TestBooleanMinShouldMatch extends LuceneTestCase {
// Can't use Hits because normalized scores will mess things // Can't use Hits because normalized scores will mess things
// up. The non-sorting version of search() that returns TopDocs // up. The non-sorting version of search() that returns TopDocs
// will not normalize scores. // will not normalize scores.
TopDocs top1 = s.search(q1,null,100); TopDocs top1 = s.search(q1,100);
TopDocs top2 = s.search(q2,null,100); TopDocs top2 = s.search(q2,100);
if (i < 100) { if (i < 100) {
QueryUtils.check(random(), q1,s); QueryUtils.check(random(), q1,s);
QueryUtils.check(random(), q2,s); QueryUtils.check(random(), q2,s);
@ -410,8 +410,8 @@ public class TestBooleanMinShouldMatch extends LuceneTestCase {
BooleanQuery q2 = new BooleanQuery(); BooleanQuery q2 = new BooleanQuery();
q2.add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); q2.add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD);
q2.setMinimumNumberShouldMatch(1); q2.setMinimumNumberShouldMatch(1);
TopDocs top1 = s.search(q1,null,100); TopDocs top1 = s.search(q1,100);
TopDocs top2 = s.search(q2,null,100); TopDocs top2 = s.search(q2,100);
assertSubsetOfSameScores(q2, top1, top2); assertSubsetOfSameScores(q2, top1, top2);
} finally { } finally {
s.setSimilarity(oldSimilarity); s.setSimilarity(oldSimilarity);
@ -432,8 +432,8 @@ public class TestBooleanMinShouldMatch extends LuceneTestCase {
BooleanQuery q2 = new BooleanQuery(); BooleanQuery q2 = new BooleanQuery();
q2.add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD); q2.add(new TermQuery(new Term("data", "1")), BooleanClause.Occur.SHOULD);
q2.add(new TermQuery(new Term("data", "Z")), BooleanClause.Occur.MUST_NOT); q2.add(new TermQuery(new Term("data", "Z")), BooleanClause.Occur.MUST_NOT);
TopDocs top1 = s.search(q1,null,100); TopDocs top1 = s.search(q1,100);
TopDocs top2 = s.search(q2,null,100); TopDocs top2 = s.search(q2,100);
assertSubsetOfSameScores(q2, top1, top2); assertSubsetOfSameScores(q2, top1, top2);
} finally { } finally {
s.setSimilarity(oldSimilarity); s.setSimilarity(oldSimilarity);

2
lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
View File

@ -52,7 +52,7 @@ public class TestBooleanOr extends LuceneTestCase {
private int search(Query q) throws IOException { private int search(Query q) throws IOException {
QueryUtils.check(random(), q,searcher); QueryUtils.check(random(), q,searcher);
return searcher.search(q, null, 1000).totalHits; return searcher.search(q, 1000).totalHits;
} }
public void testElements() throws IOException { public void testElements() throws IOException {

2
lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
View File

@ -55,7 +55,7 @@ public class TestBooleanScorer extends LuceneTestCase {
query.add(new TermQuery(new Term(FIELD, "9")), BooleanClause.Occur.MUST_NOT); query.add(new TermQuery(new Term(FIELD, "9")), BooleanClause.Occur.MUST_NOT);
IndexSearcher indexSearcher = newSearcher(ir); IndexSearcher indexSearcher = newSearcher(ir);
ScoreDoc[] hits = indexSearcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = indexSearcher.search(query, 1000).scoreDocs;
assertEquals("Number of matched documents", 2, hits.length); assertEquals("Number of matched documents", 2, hits.length);
ir.close(); ir.close();
directory.close(); directory.close();

18
lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
View File

@ -74,13 +74,13 @@ public class TestCachingWrapperFilter extends LuceneTestCase {
private void assertFilterEquals(Filter f1, Filter f2) throws Exception { private void assertFilterEquals(Filter f1, Filter f2) throws Exception {
Query query = new MatchAllDocsQuery(); Query query = new MatchAllDocsQuery();
TopDocs hits1 = is.search(query, f1, ir.maxDoc()); TopDocs hits1 = is.search(new FilteredQuery(query, f1), ir.maxDoc());
TopDocs hits2 = is.search(query, f2, ir.maxDoc()); TopDocs hits2 = is.search(new FilteredQuery(query, f2), ir.maxDoc());
assertEquals(hits1.totalHits, hits2.totalHits); assertEquals(hits1.totalHits, hits2.totalHits);
CheckHits.checkEqual(query, hits1.scoreDocs, hits2.scoreDocs); CheckHits.checkEqual(query, hits1.scoreDocs, hits2.scoreDocs);
// now do it again to confirm caching works // now do it again to confirm caching works
TopDocs hits3 = is.search(query, f1, ir.maxDoc()); TopDocs hits3 = is.search(new FilteredQuery(query, f1), ir.maxDoc());
TopDocs hits4 = is.search(query, f2, ir.maxDoc()); TopDocs hits4 = is.search(new FilteredQuery(query, f2), ir.maxDoc());
assertEquals(hits3.totalHits, hits4.totalHits); assertEquals(hits3.totalHits, hits4.totalHits);
CheckHits.checkEqual(query, hits3.scoreDocs, hits4.scoreDocs); CheckHits.checkEqual(query, hits3.scoreDocs, hits4.scoreDocs);
} }
@ -319,7 +319,7 @@ public class TestCachingWrapperFilter extends LuceneTestCase {
CachingWrapperFilter filter = new CachingWrapperFilter(startFilter, FilterCachingPolicy.ALWAYS_CACHE); CachingWrapperFilter filter = new CachingWrapperFilter(startFilter, FilterCachingPolicy.ALWAYS_CACHE);
docs = searcher.search(new MatchAllDocsQuery(), filter, 1); docs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), 1);
assertTrue(filter.ramBytesUsed() > 0); assertTrue(filter.ramBytesUsed() > 0);
assertEquals("[query + filter] Should find a hit...", 1, docs.totalHits); assertEquals("[query + filter] Should find a hit...", 1, docs.totalHits);
@ -356,7 +356,7 @@ public class TestCachingWrapperFilter extends LuceneTestCase {
searcher = newSearcher(reader, false); searcher = newSearcher(reader, false);
missCount = filter.missCount; missCount = filter.missCount;
docs = searcher.search(new MatchAllDocsQuery(), filter, 1); docs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), 1);
assertEquals("[query + filter] Should *not* find a hit...", 0, docs.totalHits); assertEquals("[query + filter] Should *not* find a hit...", 0, docs.totalHits);
// cache hit // cache hit
@ -370,7 +370,7 @@ public class TestCachingWrapperFilter extends LuceneTestCase {
reader = refreshReader(reader); reader = refreshReader(reader);
searcher = newSearcher(reader, false); searcher = newSearcher(reader, false);
docs = searcher.search(new MatchAllDocsQuery(), filter, 1); docs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), 1);
assertEquals("[query + filter] Should find a hit...", 1, docs.totalHits); assertEquals("[query + filter] Should find a hit...", 1, docs.totalHits);
missCount = filter.missCount; missCount = filter.missCount;
assertTrue(missCount > 0); assertTrue(missCount > 0);
@ -389,7 +389,7 @@ public class TestCachingWrapperFilter extends LuceneTestCase {
reader = refreshReader(reader); reader = refreshReader(reader);
searcher = newSearcher(reader, false); searcher = newSearcher(reader, false);
docs = searcher.search(new MatchAllDocsQuery(), filter, 1); docs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), 1);
assertEquals("[query + filter] Should find 2 hits...", 2, docs.totalHits); assertEquals("[query + filter] Should find 2 hits...", 2, docs.totalHits);
assertTrue(filter.missCount > missCount); assertTrue(filter.missCount > missCount);
missCount = filter.missCount; missCount = filter.missCount;
@ -405,7 +405,7 @@ public class TestCachingWrapperFilter extends LuceneTestCase {
reader = refreshReader(reader); reader = refreshReader(reader);
searcher = newSearcher(reader, false); searcher = newSearcher(reader, false);
docs = searcher.search(new MatchAllDocsQuery(), filter, 1); docs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), 1);
assertEquals("[query + filter] Should *not* find a hit...", 0, docs.totalHits); assertEquals("[query + filter] Should *not* find a hit...", 0, docs.totalHits);
// CWF reused the same entry (it dynamically applied the deletes): // CWF reused the same entry (it dynamically applied the deletes):
assertEquals(missCount, filter.missCount); assertEquals(missCount, filter.missCount);

4
lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
View File

@ -144,12 +144,12 @@ public class TestConstantScoreQuery extends LuceneTestCase {
Query query = new ConstantScoreQuery(filterB); Query query = new ConstantScoreQuery(filterB);
IndexSearcher s = newSearcher(r); IndexSearcher s = newSearcher(r);
assertEquals(1, s.search(query, filterB, 1).totalHits); // Query for field:b, Filter field:b assertEquals(1, s.search(new FilteredQuery(query, filterB), 1).totalHits); // Query for field:b, Filter field:b
Filter filterA = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "a")))); Filter filterA = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "a"))));
query = new ConstantScoreQuery(filterA); query = new ConstantScoreQuery(filterA);
assertEquals(0, s.search(query, filterB, 1).totalHits); // Query field:b, Filter field:a assertEquals(0, s.search(new FilteredQuery(query, filterB), 1).totalHits); // Query field:b, Filter field:a
r.close(); r.close();
d.close(); d.close();

12
lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
View File

@ -112,7 +112,7 @@ public class TestCustomSearcherSort extends LuceneTestCase {
// make sure the documents returned by the search match the expected list // make sure the documents returned by the search match the expected list
private void matchHits(IndexSearcher searcher, Sort sort) throws IOException { private void matchHits(IndexSearcher searcher, Sort sort) throws IOException {
// make a query without sorting first // make a query without sorting first
ScoreDoc[] hitsByRank = searcher.search(query, null, Integer.MAX_VALUE).scoreDocs; ScoreDoc[] hitsByRank = searcher.search(query, Integer.MAX_VALUE).scoreDocs;
checkHits(hitsByRank, "Sort by rank: "); // check for duplicates checkHits(hitsByRank, "Sort by rank: "); // check for duplicates
Map<Integer,Integer> resultMap = new TreeMap<>(); Map<Integer,Integer> resultMap = new TreeMap<>();
// store hits in TreeMap - TreeMap does not allow duplicates; existing // store hits in TreeMap - TreeMap does not allow duplicates; existing
@ -124,7 +124,7 @@ public class TestCustomSearcherSort extends LuceneTestCase {
} }
// now make a query using the sort criteria // now make a query using the sort criteria
ScoreDoc[] resultSort = searcher.search(query, null, Integer.MAX_VALUE, ScoreDoc[] resultSort = searcher.search(query, Integer.MAX_VALUE,
sort).scoreDocs; sort).scoreDocs;
checkHits(resultSort, "Sort by custom criteria: "); // check for duplicates checkHits(resultSort, "Sort by custom criteria: "); // check for duplicates
@ -192,23 +192,23 @@ public class TestCustomSearcherSort extends LuceneTestCase {
} }
@Override @Override
public TopFieldDocs search(Query query, Filter filter, int nDocs, Sort sort) public TopFieldDocs search(Query query, int nDocs, Sort sort)
throws IOException { throws IOException {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(query, BooleanClause.Occur.MUST); bq.add(query, BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term("mandant", Integer.toString(switcher))), bq.add(new TermQuery(new Term("mandant", Integer.toString(switcher))),
BooleanClause.Occur.MUST); BooleanClause.Occur.MUST);
return super.search(bq, filter, nDocs, sort); return super.search(bq, nDocs, sort);
} }
@Override @Override
public TopDocs search(Query query, Filter filter, int nDocs) public TopDocs search(Query query, int nDocs)
throws IOException { throws IOException {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(query, BooleanClause.Occur.MUST); bq.add(query, BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term("mandant", Integer.toString(switcher))), bq.add(new TermQuery(new Term("mandant", Integer.toString(switcher))),
BooleanClause.Occur.MUST); BooleanClause.Occur.MUST);
return super.search(bq, filter, nDocs); return super.search(bq, nDocs);
} }
} }

24
lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java
View File

@ -76,23 +76,23 @@ public class TestDateFilter extends LuceneTestCase {
ScoreDoc[] result; ScoreDoc[] result;
// ensure that queries return expected results without DateFilter first // ensure that queries return expected results without DateFilter first
result = searcher.search(query1, null, 1000).scoreDocs; result = searcher.search(query1, 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
result = searcher.search(query2, null, 1000).scoreDocs; result = searcher.search(query2, 1000).scoreDocs;
assertEquals(1, result.length); assertEquals(1, result.length);
// run queries with DateFilter // run queries with DateFilter
result = searcher.search(query1, df1, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query1, df1), 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
result = searcher.search(query1, df2, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query1, df2), 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
result = searcher.search(query2, df1, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query2, df1), 1000).scoreDocs;
assertEquals(1, result.length); assertEquals(1, result.length);
result = searcher.search(query2, df2, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query2, df2), 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
reader.close(); reader.close();
indexStore.close(); indexStore.close();
@ -140,23 +140,23 @@ public class TestDateFilter extends LuceneTestCase {
ScoreDoc[] result; ScoreDoc[] result;
// ensure that queries return expected results without DateFilter first // ensure that queries return expected results without DateFilter first
result = searcher.search(query1, null, 1000).scoreDocs; result = searcher.search(query1, 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
result = searcher.search(query2, null, 1000).scoreDocs; result = searcher.search(query2, 1000).scoreDocs;
assertEquals(1, result.length); assertEquals(1, result.length);
// run queries with DateFilter // run queries with DateFilter
result = searcher.search(query1, df1, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query1, df1), 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
result = searcher.search(query1, df2, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query1, df2), 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
result = searcher.search(query2, df1, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query2, df1), 1000).scoreDocs;
assertEquals(1, result.length); assertEquals(1, result.length);
result = searcher.search(query2, df2, 1000).scoreDocs; result = searcher.search(new FilteredQuery(query2, df2), 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
reader.close(); reader.close();
indexStore.close(); indexStore.close();

2
lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
View File

@ -83,7 +83,7 @@ public class TestDateSort extends LuceneTestCase {
// Execute the search and process the search results. // Execute the search and process the search results.
String[] actualOrder = new String[5]; String[] actualOrder = new String[5];
ScoreDoc[] hits = searcher.search(query, null, 1000, sort).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000, sort).scoreDocs;
for (int i = 0; i < hits.length; i++) { for (int i = 0; i < hits.length; i++) {
StoredDocument document = searcher.doc(hits[i].doc); StoredDocument document = searcher.doc(hits[i].doc);
String text = document.get(TEXT_FIELD); String text = document.get(TEXT_FIELD);

16
lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
View File

@ -209,7 +209,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
q.add(tq("hed", "elephant")); q.add(tq("hed", "elephant"));
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
assertEquals("all docs should match " + q.toString(), 4, h.length); assertEquals("all docs should match " + q.toString(), 4, h.length);
@ -233,7 +233,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
q.add(tq("dek", "elephant")); q.add(tq("dek", "elephant"));
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
assertEquals("3 docs should match " + q.toString(), 3, h.length); assertEquals("3 docs should match " + q.toString(), 3, h.length);
@ -258,7 +258,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
q.add(tq("dek", "elephant")); q.add(tq("dek", "elephant"));
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
assertEquals("all docs should match " + q.toString(), 4, h.length); assertEquals("all docs should match " + q.toString(), 4, h.length);
@ -281,7 +281,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
q.add(tq("dek", "elephant")); q.add(tq("dek", "elephant"));
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
assertEquals("3 docs should match " + q.toString(), 3, h.length); assertEquals("3 docs should match " + q.toString(), 3, h.length);
@ -320,7 +320,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
assertEquals("3 docs should match " + q.toString(), 3, h.length); assertEquals("3 docs should match " + q.toString(), 3, h.length);
@ -352,7 +352,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
} }
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
assertEquals("4 docs should match " + q.toString(), 4, h.length); assertEquals("4 docs should match " + q.toString(), 4, h.length);
@ -388,7 +388,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
} }
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {
@ -442,7 +442,7 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {
} }
QueryUtils.check(random(), q, s); QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs; ScoreDoc[] h = s.search(q, 1000).scoreDocs;
try { try {

4
lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
View File

@ -133,7 +133,7 @@ public class TestDocIdSet extends LuceneTestCase {
} }
}; };
Assert.assertEquals(0, searcher.search(new MatchAllDocsQuery(), f, 10).totalHits); Assert.assertEquals(0, searcher.search(new FilteredQuery(new MatchAllDocsQuery(), f), 10).totalHits);
reader.close(); reader.close();
dir.close(); dir.close();
} }
@ -179,7 +179,7 @@ public class TestDocIdSet extends LuceneTestCase {
} }
}; };
Assert.assertEquals(0, searcher.search(new MatchAllDocsQuery(), f, 10).totalHits); Assert.assertEquals(0, searcher.search(new FilteredQuery(new MatchAllDocsQuery(), f), 10).totalHits);
reader.close(); reader.close();
dir.close(); dir.close();
} }

2
lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
View File

@ -80,7 +80,7 @@ public class TestElevationComparator extends LuceneTestCase {
); );
TopDocsCollector<Entry> topCollector = TopFieldCollector.create(sort, 50, false, true, true); TopDocsCollector<Entry> topCollector = TopFieldCollector.create(sort, 50, false, true, true);
searcher.search(newq, null, topCollector); searcher.search(newq, topCollector);
TopDocs topDocs = topCollector.topDocs(0, 10); TopDocs topDocs = topCollector.topDocs(0, 10);
int nDocsReturned = topDocs.scoreDocs.length; int nDocsReturned = topDocs.scoreDocs.length;

7
lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
View File

@ -21,7 +21,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.RandomIndexWriter;
@ -57,18 +56,18 @@ public class TestFieldCacheTermsFilter extends LuceneTestCase {
List<String> terms = new ArrayList<>(); List<String> terms = new ArrayList<>();
terms.add("5"); terms.add("5");
results = searcher.search(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0])), numDocs).scoreDocs; results = searcher.search(new FilteredQuery(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0]))), numDocs).scoreDocs;
assertEquals("Must match nothing", 0, results.length); assertEquals("Must match nothing", 0, results.length);
terms = new ArrayList<>(); terms = new ArrayList<>();
terms.add("10"); terms.add("10");
results = searcher.search(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0])), numDocs).scoreDocs; results = searcher.search(new FilteredQuery(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0]))), numDocs).scoreDocs;
assertEquals("Must match 1", 1, results.length); assertEquals("Must match 1", 1, results.length);
terms = new ArrayList<>(); terms = new ArrayList<>();
terms.add("10"); terms.add("10");
terms.add("20"); terms.add("20");
results = searcher.search(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0])), numDocs).scoreDocs; results = searcher.search(new FilteredQuery(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0]))), numDocs).scoreDocs;
assertEquals("Must match 2", 2, results.length); assertEquals("Must match 2", 2, results.length);
reader.close(); reader.close();

22
lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
View File

@ -136,33 +136,33 @@ public class TestFilteredQuery extends LuceneTestCase {
private void tFilteredQuery(final boolean useRandomAccess) throws Exception { private void tFilteredQuery(final boolean useRandomAccess) throws Exception {
Query filteredquery = new FilteredQuery(query, filter, randomFilterStrategy(random(), useRandomAccess)); Query filteredquery = new FilteredQuery(query, filter, randomFilterStrategy(random(), useRandomAccess));
ScoreDoc[] hits = searcher.search (filteredquery, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search (filteredquery, 1000).scoreDocs;
assertEquals (1, hits.length); assertEquals (1, hits.length);
assertEquals (1, hits[0].doc); assertEquals (1, hits[0].doc);
QueryUtils.check(random(), filteredquery,searcher); QueryUtils.check(random(), filteredquery,searcher);
hits = searcher.search (filteredquery, null, 1000, new Sort(new SortField("sorter", SortField.Type.STRING))).scoreDocs; hits = searcher.search (filteredquery, 1000, new Sort(new SortField("sorter", SortField.Type.STRING))).scoreDocs;
assertEquals (1, hits.length); assertEquals (1, hits.length);
assertEquals (1, hits[0].doc); assertEquals (1, hits[0].doc);
filteredquery = new FilteredQuery(new TermQuery (new Term ("field", "one")), filter, randomFilterStrategy(random(), useRandomAccess)); filteredquery = new FilteredQuery(new TermQuery (new Term ("field", "one")), filter, randomFilterStrategy(random(), useRandomAccess));
hits = searcher.search (filteredquery, null, 1000).scoreDocs; hits = searcher.search (filteredquery, 1000).scoreDocs;
assertEquals (2, hits.length); assertEquals (2, hits.length);
QueryUtils.check(random(), filteredquery,searcher); QueryUtils.check(random(), filteredquery,searcher);
filteredquery = new FilteredQuery(new MatchAllDocsQuery(), filter, randomFilterStrategy(random(), useRandomAccess)); filteredquery = new FilteredQuery(new MatchAllDocsQuery(), filter, randomFilterStrategy(random(), useRandomAccess));
hits = searcher.search (filteredquery, null, 1000).scoreDocs; hits = searcher.search (filteredquery, 1000).scoreDocs;
assertEquals (2, hits.length); assertEquals (2, hits.length);
QueryUtils.check(random(), filteredquery,searcher); QueryUtils.check(random(), filteredquery,searcher);
filteredquery = new FilteredQuery(new TermQuery (new Term ("field", "x")), filter, randomFilterStrategy(random(), useRandomAccess)); filteredquery = new FilteredQuery(new TermQuery (new Term ("field", "x")), filter, randomFilterStrategy(random(), useRandomAccess));
hits = searcher.search (filteredquery, null, 1000).scoreDocs; hits = searcher.search (filteredquery, 1000).scoreDocs;
assertEquals (1, hits.length); assertEquals (1, hits.length);
assertEquals (3, hits[0].doc); assertEquals (3, hits[0].doc);
QueryUtils.check(random(), filteredquery,searcher); QueryUtils.check(random(), filteredquery,searcher);
filteredquery = new FilteredQuery(new TermQuery (new Term ("field", "y")), filter, randomFilterStrategy(random(), useRandomAccess)); filteredquery = new FilteredQuery(new TermQuery (new Term ("field", "y")), filter, randomFilterStrategy(random(), useRandomAccess));
hits = searcher.search (filteredquery, null, 1000).scoreDocs; hits = searcher.search (filteredquery, 1000).scoreDocs;
assertEquals (0, hits.length); assertEquals (0, hits.length);
QueryUtils.check(random(), filteredquery,searcher); QueryUtils.check(random(), filteredquery,searcher);
@ -209,8 +209,8 @@ public class TestFilteredQuery extends LuceneTestCase {
* Tests whether the scores of the two queries are the same. * Tests whether the scores of the two queries are the same.
*/ */
public void assertScoreEquals(Query q1, Query q2) throws Exception { public void assertScoreEquals(Query q1, Query q2) throws Exception {
ScoreDoc[] hits1 = searcher.search (q1, null, 1000).scoreDocs; ScoreDoc[] hits1 = searcher.search (q1, 1000).scoreDocs;
ScoreDoc[] hits2 = searcher.search (q2, null, 1000).scoreDocs; ScoreDoc[] hits2 = searcher.search (q2, 1000).scoreDocs;
assertEquals(hits1.length, hits2.length); assertEquals(hits1.length, hits2.length);
@ -233,7 +233,7 @@ public class TestFilteredQuery extends LuceneTestCase {
"sorter", "b", "d", true, true); "sorter", "b", "d", true, true);
Query filteredquery = new FilteredQuery(rq, filter, randomFilterStrategy(random(), useRandomAccess)); Query filteredquery = new FilteredQuery(rq, filter, randomFilterStrategy(random(), useRandomAccess));
ScoreDoc[] hits = searcher.search(filteredquery, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(filteredquery, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
QueryUtils.check(random(), filteredquery,searcher); QueryUtils.check(random(), filteredquery,searcher);
} }
@ -251,7 +251,7 @@ public class TestFilteredQuery extends LuceneTestCase {
bq.add(query, BooleanClause.Occur.MUST); bq.add(query, BooleanClause.Occur.MUST);
query = new FilteredQuery(new TermQuery(new Term("field", "one")), new SingleDocTestFilter(1), randomFilterStrategy(random(), useRandomAccess)); query = new FilteredQuery(new TermQuery(new Term("field", "one")), new SingleDocTestFilter(1), randomFilterStrategy(random(), useRandomAccess));
bq.add(query, BooleanClause.Occur.MUST); bq.add(query, BooleanClause.Occur.MUST);
ScoreDoc[] hits = searcher.search(bq, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(bq, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }
@ -269,7 +269,7 @@ public class TestFilteredQuery extends LuceneTestCase {
bq.add(query, BooleanClause.Occur.SHOULD); bq.add(query, BooleanClause.Occur.SHOULD);
query = new FilteredQuery(new TermQuery(new Term("field", "one")), new SingleDocTestFilter(1), randomFilterStrategy(random(), useRandomAccess)); query = new FilteredQuery(new TermQuery(new Term("field", "one")), new SingleDocTestFilter(1), randomFilterStrategy(random(), useRandomAccess));
bq.add(query, BooleanClause.Occur.SHOULD); bq.add(query, BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = searcher.search(bq, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(bq, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }

2
lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
View File

@ -75,7 +75,7 @@ public class TestFilteredSearch extends LuceneTestCase {
IndexReader reader = DirectoryReader.open(directory); IndexReader reader = DirectoryReader.open(directory);
IndexSearcher indexSearcher = newSearcher(reader); IndexSearcher indexSearcher = newSearcher(reader);
ScoreDoc[] hits = indexSearcher.search(booleanQuery, filter, 1000).scoreDocs; ScoreDoc[] hits = indexSearcher.search(new FilteredQuery(booleanQuery, filter), 1000).scoreDocs;
assertEquals("Number of matched documents", 1, hits.length); assertEquals("Number of matched documents", 1, hits.length);
reader.close(); reader.close();
} }

56
lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
View File

@ -48,7 +48,7 @@ public class TestFuzzyQuery extends LuceneTestCase {
writer.close(); writer.close();
FuzzyQuery query = new FuzzyQuery(new Term("field", "abc"), FuzzyQuery.defaultMaxEdits, 1); FuzzyQuery query = new FuzzyQuery(new Term("field", "abc"), FuzzyQuery.defaultMaxEdits, 1);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
reader.close(); reader.close();
directory.close(); directory.close();
@ -70,32 +70,32 @@ public class TestFuzzyQuery extends LuceneTestCase {
writer.close(); writer.close();
FuzzyQuery query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 0); FuzzyQuery query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 0);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
// same with prefix // same with prefix
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 1); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 1);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 2); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 2);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 3); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 3);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 4); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 4);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 5); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 5);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 6); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 6);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
// test scoring // test scoring
query = new FuzzyQuery(new Term("field", "bbbbb"), FuzzyQuery.defaultMaxEdits, 0); query = new FuzzyQuery(new Term("field", "bbbbb"), FuzzyQuery.defaultMaxEdits, 0);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("3 documents should match", 3, hits.length); assertEquals("3 documents should match", 3, hits.length);
List<String> order = Arrays.asList("bbbbb","abbbb","aabbb"); List<String> order = Arrays.asList("bbbbb","abbbb","aabbb");
for (int i = 0; i < hits.length; i++) { for (int i = 0; i < hits.length; i++) {
@ -107,7 +107,7 @@ public class TestFuzzyQuery extends LuceneTestCase {
// test pq size by supplying maxExpansions=2 // test pq size by supplying maxExpansions=2
// This query would normally return 3 documents, because 3 terms match (see above): // This query would normally return 3 documents, because 3 terms match (see above):
query = new FuzzyQuery(new Term("field", "bbbbb"), FuzzyQuery.defaultMaxEdits, 0, 2, false); query = new FuzzyQuery(new Term("field", "bbbbb"), FuzzyQuery.defaultMaxEdits, 0, 2, false);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("only 2 documents should match", 2, hits.length); assertEquals("only 2 documents should match", 2, hits.length);
order = Arrays.asList("bbbbb","abbbb"); order = Arrays.asList("bbbbb","abbbb");
for (int i = 0; i < hits.length; i++) { for (int i = 0; i < hits.length; i++) {
@ -118,15 +118,15 @@ public class TestFuzzyQuery extends LuceneTestCase {
// not similar enough: // not similar enough:
query = new FuzzyQuery(new Term("field", "xxxxx"), FuzzyQuery.defaultMaxEdits, 0); query = new FuzzyQuery(new Term("field", "xxxxx"), FuzzyQuery.defaultMaxEdits, 0);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
query = new FuzzyQuery(new Term("field", "aaccc"), FuzzyQuery.defaultMaxEdits, 0); // edit distance to "aaaaa" = 3 query = new FuzzyQuery(new Term("field", "aaccc"), FuzzyQuery.defaultMaxEdits, 0); // edit distance to "aaaaa" = 3
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// query identical to a word in the index: // query identical to a word in the index:
query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 0); query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 0);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
// default allows for up to two edits: // default allows for up to two edits:
@ -135,7 +135,7 @@ public class TestFuzzyQuery extends LuceneTestCase {
// query similar to a word in the index: // query similar to a word in the index:
query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 0); query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 0);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab")); assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
@ -143,63 +143,63 @@ public class TestFuzzyQuery extends LuceneTestCase {
// now with prefix // now with prefix
query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 1); query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 1);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab")); assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb")); assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb"));
query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 2); query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 2);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab")); assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb")); assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb"));
query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 3); query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 3);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab")); assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb")); assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb"));
query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 4); query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 4);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab")); assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 5); query = new FuzzyQuery(new Term("field", "aaaac"), FuzzyQuery.defaultMaxEdits, 5);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 0); query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 0);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
// now with prefix // now with prefix
query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 1); query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 1);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 2); query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 2);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 3); query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 3);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 4); query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 4);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd")); assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 5); query = new FuzzyQuery(new Term("field", "ddddX"), FuzzyQuery.defaultMaxEdits, 5);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// different field = no match: // different field = no match:
query = new FuzzyQuery(new Term("anotherfield", "ddddX"), FuzzyQuery.defaultMaxEdits, 0); query = new FuzzyQuery(new Term("anotherfield", "ddddX"), FuzzyQuery.defaultMaxEdits, 0);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
reader.close(); reader.close();
@ -234,7 +234,7 @@ public class TestFuzzyQuery extends LuceneTestCase {
FuzzyQuery query = new FuzzyQuery(new Term("field", "WEBER"), 2, 1); FuzzyQuery query = new FuzzyQuery(new Term("field", "WEBER"), 2, 1);
//query.setRewriteMethod(FuzzyQuery.SCORING_BOOLEAN_QUERY_REWRITE); //query.setRewriteMethod(FuzzyQuery.SCORING_BOOLEAN_QUERY_REWRITE);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(8, hits.length); assertEquals(8, hits.length);
reader.close(); reader.close();
@ -296,7 +296,7 @@ public class TestFuzzyQuery extends LuceneTestCase {
FuzzyQuery query = new FuzzyQuery(new Term("field", "lucene")); FuzzyQuery query = new FuzzyQuery(new Term("field", "lucene"));
query.setRewriteMethod(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(50)); query.setRewriteMethod(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(50));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
// normally, 'Lucenne' would be the first result as IDF will skew the score. // normally, 'Lucenne' would be the first result as IDF will skew the score.
assertEquals("Lucene", reader.document(hits[0].doc).get("field")); assertEquals("Lucene", reader.document(hits[0].doc).get("field"));

27
lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
View File

@ -81,10 +81,6 @@ public class TestIndexSearcher extends LuceneTestCase {
null, null,
new Sort(new SortField("field2", SortField.Type.STRING)) new Sort(new SortField("field2", SortField.Type.STRING))
}; };
Filter filters[] = new Filter[] {
null,
new QueryWrapperFilter(new TermQuery(new Term("field2", "true")))
};
ScoreDoc afters[] = new ScoreDoc[] { ScoreDoc afters[] = new ScoreDoc[] {
null, null,
new FieldDoc(0, 0f, new Object[] { new BytesRef("boo!") }) new FieldDoc(0, 0f, new Object[] { new BytesRef("boo!") })
@ -94,24 +90,19 @@ public class TestIndexSearcher extends LuceneTestCase {
for (ScoreDoc after : afters) { for (ScoreDoc after : afters) {
for (Query query : queries) { for (Query query : queries) {
for (Sort sort : sorts) { for (Sort sort : sorts) {
for (Filter filter : filters) {
searcher.search(query, Integer.MAX_VALUE); searcher.search(query, Integer.MAX_VALUE);
searcher.searchAfter(after, query, Integer.MAX_VALUE); searcher.searchAfter(after, query, Integer.MAX_VALUE);
searcher.search(query, filter, Integer.MAX_VALUE);
searcher.searchAfter(after, query, filter, Integer.MAX_VALUE);
if (sort != null) { if (sort != null) {
searcher.search(query, Integer.MAX_VALUE, sort); searcher.search(query, Integer.MAX_VALUE, sort);
searcher.search(query, filter, Integer.MAX_VALUE, sort); searcher.search(query, Integer.MAX_VALUE, sort, true, true);
searcher.search(query, filter, Integer.MAX_VALUE, sort, true, true); searcher.search(query, Integer.MAX_VALUE, sort, true, false);
searcher.search(query, filter, Integer.MAX_VALUE, sort, true, false); searcher.search(query, Integer.MAX_VALUE, sort, false, true);
searcher.search(query, filter, Integer.MAX_VALUE, sort, false, true); searcher.search(query, Integer.MAX_VALUE, sort, false, false);
searcher.search(query, filter, Integer.MAX_VALUE, sort, false, false); searcher.searchAfter(after, query, Integer.MAX_VALUE, sort);
searcher.searchAfter(after, query, filter, Integer.MAX_VALUE, sort); searcher.searchAfter(after, query, Integer.MAX_VALUE, sort, true, true);
searcher.searchAfter(after, query, filter, Integer.MAX_VALUE, sort, true, true); searcher.searchAfter(after, query, Integer.MAX_VALUE, sort, true, false);
searcher.searchAfter(after, query, filter, Integer.MAX_VALUE, sort, true, false); searcher.searchAfter(after, query, Integer.MAX_VALUE, sort, false, true);
searcher.searchAfter(after, query, filter, Integer.MAX_VALUE, sort, false, true); searcher.searchAfter(after, query, Integer.MAX_VALUE, sort, false, false);
searcher.searchAfter(after, query, filter, Integer.MAX_VALUE, sort, false, false);
}
} }
} }
} }

8
lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
View File

@ -54,7 +54,7 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
IndexSearcher is = newSearcher(ir); IndexSearcher is = newSearcher(ir);
ScoreDoc[] hits; ScoreDoc[] hits;
hits = is.search(new MatchAllDocsQuery(), null, 1000).scoreDocs; hits = is.search(new MatchAllDocsQuery(), 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
assertEquals("one", is.doc(hits[0].doc).get("key")); assertEquals("one", is.doc(hits[0].doc).get("key"));
assertEquals("two", is.doc(hits[1].doc).get("key")); assertEquals("two", is.doc(hits[1].doc).get("key"));
@ -65,13 +65,13 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
hits = is.search(bq, null, 1000).scoreDocs; hits = is.search(bq, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
bq = new BooleanQuery(); bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.MUST);
bq.add(new TermQuery(new Term("key", "three")), BooleanClause.Occur.MUST); bq.add(new TermQuery(new Term("key", "three")), BooleanClause.Occur.MUST);
hits = is.search(bq, null, 1000).scoreDocs; hits = is.search(bq, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
iw.deleteDocuments(new Term("key", "one")); iw.deleteDocuments(new Term("key", "one"));
@ -79,7 +79,7 @@ public class TestMatchAllDocsQuery extends LuceneTestCase {
ir = DirectoryReader.open(iw, true); ir = DirectoryReader.open(iw, true);
is = newSearcher(ir); is = newSearcher(ir);
hits = is.search(new MatchAllDocsQuery(), null, 1000).scoreDocs; hits = is.search(new MatchAllDocsQuery(), 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
iw.close(); iw.close();

14
lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
View File

@ -90,9 +90,9 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
.toString()); .toString());
ScoreDoc[] result; ScoreDoc[] result;
result = searcher.search(query1, null, 1000).scoreDocs; result = searcher.search(query1, 1000).scoreDocs;
assertEquals(2, result.length); assertEquals(2, result.length);
result = searcher.search(query2, null, 1000).scoreDocs; result = searcher.search(query2, 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
// search for "blue* pizza": // search for "blue* pizza":
@ -110,13 +110,13 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
query3.add(termsWithPrefix.toArray(new Term[0])); query3.add(termsWithPrefix.toArray(new Term[0]));
query3.add(new Term("body", "pizza")); query3.add(new Term("body", "pizza"));
result = searcher.search(query3, null, 1000).scoreDocs; result = searcher.search(query3, 1000).scoreDocs;
assertEquals(2, result.length); // blueberry pizza, bluebird pizza assertEquals(2, result.length); // blueberry pizza, bluebird pizza
assertEquals("body:\"(blueberry bluebird) pizza\"", query3.toString()); assertEquals("body:\"(blueberry bluebird) pizza\"", query3.toString());
// test slop: // test slop:
query3.setSlop(1); query3.setSlop(1);
result = searcher.search(query3, null, 1000).scoreDocs; result = searcher.search(query3, 1000).scoreDocs;
// just make sure no exc: // just make sure no exc:
searcher.explain(query3, 0); searcher.explain(query3, 0);
@ -224,7 +224,7 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
q.add(trouble, BooleanClause.Occur.MUST); q.add(trouble, BooleanClause.Occur.MUST);
// exception will be thrown here without fix // exception will be thrown here without fix
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals("Wrong number of hits", 2, hits.length); assertEquals("Wrong number of hits", 2, hits.length);
@ -256,7 +256,7 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
q.add(trouble, BooleanClause.Occur.MUST); q.add(trouble, BooleanClause.Occur.MUST);
// exception will be thrown here without fix for #35626: // exception will be thrown here without fix for #35626:
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals("Wrong number of hits", 0, hits.length); assertEquals("Wrong number of hits", 0, hits.length);
writer.close(); writer.close();
reader.close(); reader.close();
@ -275,7 +275,7 @@ public class TestMultiPhraseQuery extends LuceneTestCase {
q.add(new Term("body", "a")); q.add(new Term("body", "a"));
q.add(new Term[] {new Term("body", "nope"), new Term("body", "nope")}); q.add(new Term[] {new Term("body", "nope"), new Term("body", "nope")});
assertEquals("Wrong number of hits", 0, assertEquals("Wrong number of hits", 0,
searcher.search(q, null, 1).totalHits); searcher.search(q, 1).totalHits);
// just make sure no exc: // just make sure no exc:
searcher.explain(q, 0); searcher.explain(q, 0);

120
lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
View File

@ -143,7 +143,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
// some hits match more terms then others, score should be the same // some hits match more terms then others, score should be the same
result = search.search(csrq("data", "1", "6", T, T), null, 1000).scoreDocs; result = search.search(csrq("data", "1", "6", T, T), 1000).scoreDocs;
int numHits = result.length; int numHits = result.length;
assertEquals("wrong number of results", 6, numHits); assertEquals("wrong number of results", 6, numHits);
float score = result[0].score; float score = result[0].score;
@ -152,7 +152,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
result[i].score, SCORE_COMP_THRESH); result[i].score, SCORE_COMP_THRESH);
} }
result = search.search(csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), null, 1000).scoreDocs; result = search.search(csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), 1000).scoreDocs;
numHits = result.length; numHits = result.length;
assertEquals("wrong number of results", 6, numHits); assertEquals("wrong number of results", 6, numHits);
for (int i = 0; i < numHits; i++) { for (int i = 0; i < numHits; i++) {
@ -160,7 +160,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
result[i].score, SCORE_COMP_THRESH); result[i].score, SCORE_COMP_THRESH);
} }
result = search.search(csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, 1000).scoreDocs; result = search.search(csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), 1000).scoreDocs;
numHits = result.length; numHits = result.length;
assertEquals("wrong number of results", 6, numHits); assertEquals("wrong number of results", 6, numHits);
for (int i = 0; i < numHits; i++) { for (int i = 0; i < numHits; i++) {
@ -182,7 +182,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(dummyTerm, BooleanClause.Occur.SHOULD); // hits one doc bq.add(dummyTerm, BooleanClause.Occur.SHOULD); // hits one doc
bq.add(csrq("data", "#", "#", T, T), BooleanClause.Occur.SHOULD); // hits no docs bq.add(csrq("data", "#", "#", T, T), BooleanClause.Occur.SHOULD); // hits no docs
result = search.search(bq, null, 1000).scoreDocs; result = search.search(bq, 1000).scoreDocs;
int numHits = result.length; int numHits = result.length;
assertEquals("wrong number of results", 1, numHits); assertEquals("wrong number of results", 1, numHits);
float score = result[0].score; float score = result[0].score;
@ -194,7 +194,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
bq = new BooleanQuery(); bq = new BooleanQuery();
bq.add(dummyTerm, BooleanClause.Occur.SHOULD); // hits one doc bq.add(dummyTerm, BooleanClause.Occur.SHOULD); // hits one doc
bq.add(csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), BooleanClause.Occur.SHOULD); // hits no docs bq.add(csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), BooleanClause.Occur.SHOULD); // hits no docs
result = search.search(bq, null, 1000).scoreDocs; result = search.search(bq, 1000).scoreDocs;
numHits = result.length; numHits = result.length;
assertEquals("wrong number of results", 1, numHits); assertEquals("wrong number of results", 1, numHits);
for (int i = 0; i < numHits; i++) { for (int i = 0; i < numHits; i++) {
@ -205,7 +205,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
bq = new BooleanQuery(); bq = new BooleanQuery();
bq.add(dummyTerm, BooleanClause.Occur.SHOULD); // hits one doc bq.add(dummyTerm, BooleanClause.Occur.SHOULD); // hits one doc
bq.add(csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), BooleanClause.Occur.SHOULD); // hits no docs bq.add(csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), BooleanClause.Occur.SHOULD); // hits no docs
result = search.search(bq, null, 1000).scoreDocs; result = search.search(bq, 1000).scoreDocs;
numHits = result.length; numHits = result.length;
assertEquals("wrong number of results", 1, numHits); assertEquals("wrong number of results", 1, numHits);
for (int i = 0; i < numHits; i++) { for (int i = 0; i < numHits; i++) {
@ -226,7 +226,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
search.setSimilarity(new DefaultSimilarity()); search.setSimilarity(new DefaultSimilarity());
Query q = csrq("data", "1", "6", T, T); Query q = csrq("data", "1", "6", T, T);
q.setBoost(100); q.setBoost(100);
search.search(q, null, new SimpleCollector() { search.search(q, new SimpleCollector() {
private int base = 0; private int base = 0;
private Scorer scorer; private Scorer scorer;
@Override @Override
@ -259,7 +259,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
bq.add(q1, BooleanClause.Occur.SHOULD); bq.add(q1, BooleanClause.Occur.SHOULD);
bq.add(q2, BooleanClause.Occur.SHOULD); bq.add(q2, BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = search.search(bq, null, 1000).scoreDocs; ScoreDoc[] hits = search.search(bq, 1000).scoreDocs;
Assert.assertEquals(1, hits[0].doc); Assert.assertEquals(1, hits[0].doc);
Assert.assertEquals(0, hits[1].doc); Assert.assertEquals(0, hits[1].doc);
assertTrue(hits[0].score > hits[1].score); assertTrue(hits[0].score > hits[1].score);
@ -271,7 +271,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
bq.add(q1, BooleanClause.Occur.SHOULD); bq.add(q1, BooleanClause.Occur.SHOULD);
bq.add(q2, BooleanClause.Occur.SHOULD); bq.add(q2, BooleanClause.Occur.SHOULD);
hits = search.search(bq, null, 1000).scoreDocs; hits = search.search(bq, 1000).scoreDocs;
Assert.assertEquals(1, hits[0].doc); Assert.assertEquals(1, hits[0].doc);
Assert.assertEquals(0, hits[1].doc); Assert.assertEquals(0, hits[1].doc);
assertTrue(hits[0].score > hits[1].score); assertTrue(hits[0].score > hits[1].score);
@ -283,7 +283,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
bq.add(q1, BooleanClause.Occur.SHOULD); bq.add(q1, BooleanClause.Occur.SHOULD);
bq.add(q2, BooleanClause.Occur.SHOULD); bq.add(q2, BooleanClause.Occur.SHOULD);
hits = search.search(bq, null, 1000).scoreDocs; hits = search.search(bq, 1000).scoreDocs;
Assert.assertEquals(0, hits[0].doc); Assert.assertEquals(0, hits[0].doc);
Assert.assertEquals(1, hits[1].doc); Assert.assertEquals(1, hits[1].doc);
assertTrue(hits[0].score > hits[1].score); assertTrue(hits[0].score > hits[1].score);
@ -300,7 +300,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
Query rq = TermRangeQuery.newStringRange("data", "1", "4", T, T); Query rq = TermRangeQuery.newStringRange("data", "1", "4", T, T);
ScoreDoc[] expected = search.search(rq, null, 1000).scoreDocs; ScoreDoc[] expected = search.search(rq, 1000).scoreDocs;
int numHits = expected.length; int numHits = expected.length;
// now do a boolean where which also contains a // now do a boolean where which also contains a
@ -310,7 +310,7 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
q.add(rq, BooleanClause.Occur.MUST);// T, F); q.add(rq, BooleanClause.Occur.MUST);// T, F);
q.add(csrq("data", "1", "6", T, T), BooleanClause.Occur.MUST);// T, F); q.add(csrq("data", "1", "6", T, T), BooleanClause.Occur.MUST);// T, F);
ScoreDoc[] actual = search.search(q, null, 1000).scoreDocs; ScoreDoc[] actual = search.search(q, 1000).scoreDocs;
assertEquals("wrong numebr of hits", numHits, actual.length); assertEquals("wrong numebr of hits", numHits, actual.length);
for (int i = 0; i < numHits; i++) { for (int i = 0; i < numHits; i++) {
@ -344,110 +344,110 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
// test id, bounded on both ends // test id, bounded on both ends
result = search.search(csrq("id", minIP, maxIP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, T, T), numDocs).scoreDocs;
assertEquals("find all", numDocs, result.length); assertEquals("find all", numDocs, result.length);
result = search.search(csrq("id", minIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("find all", numDocs, result.length); assertEquals("find all", numDocs, result.length);
result = search.search(csrq("id", minIP, maxIP, T, F), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, T, F), numDocs).scoreDocs;
assertEquals("all but last", numDocs - 1, result.length); assertEquals("all but last", numDocs - 1, result.length);
result = search.search(csrq("id", minIP, maxIP, T, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, T, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("all but last", numDocs - 1, result.length); assertEquals("all but last", numDocs - 1, result.length);
result = search.search(csrq("id", minIP, maxIP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, F, T), numDocs).scoreDocs;
assertEquals("all but first", numDocs - 1, result.length); assertEquals("all but first", numDocs - 1, result.length);
result = search.search(csrq("id", minIP, maxIP, F, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, F, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("all but first", numDocs - 1, result.length); assertEquals("all but first", numDocs - 1, result.length);
result = search.search(csrq("id", minIP, maxIP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, F, F), numDocs).scoreDocs;
assertEquals("all but ends", numDocs - 2, result.length); assertEquals("all but ends", numDocs - 2, result.length);
result = search.search(csrq("id", minIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("all but ends", numDocs - 2, result.length); assertEquals("all but ends", numDocs - 2, result.length);
result = search.search(csrq("id", medIP, maxIP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, maxIP, T, T), numDocs).scoreDocs;
assertEquals("med and up", 1 + maxId - medId, result.length); assertEquals("med and up", 1 + maxId - medId, result.length);
result = search.search(csrq("id", medIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("med and up", 1 + maxId - medId, result.length); assertEquals("med and up", 1 + maxId - medId, result.length);
result = search.search(csrq("id", minIP, medIP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, medIP, T, T), numDocs).scoreDocs;
assertEquals("up to med", 1 + medId - minId, result.length); assertEquals("up to med", 1 + medId - minId, result.length);
result = search.search(csrq("id", minIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("up to med", 1 + medId - minId, result.length); assertEquals("up to med", 1 + medId - minId, result.length);
// unbounded id // unbounded id
result = search.search(csrq("id", minIP, null, T, F), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, null, T, F), numDocs).scoreDocs;
assertEquals("min and up", numDocs, result.length); assertEquals("min and up", numDocs, result.length);
result = search.search(csrq("id", null, maxIP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("id", null, maxIP, F, T), numDocs).scoreDocs;
assertEquals("max and down", numDocs, result.length); assertEquals("max and down", numDocs, result.length);
result = search.search(csrq("id", minIP, null, F, F), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, null, F, F), numDocs).scoreDocs;
assertEquals("not min, but up", numDocs - 1, result.length); assertEquals("not min, but up", numDocs - 1, result.length);
result = search.search(csrq("id", null, maxIP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("id", null, maxIP, F, F), numDocs).scoreDocs;
assertEquals("not max, but down", numDocs - 1, result.length); assertEquals("not max, but down", numDocs - 1, result.length);
result = search.search(csrq("id", medIP, maxIP, T, F), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, maxIP, T, F), numDocs).scoreDocs;
assertEquals("med and up, not max", maxId - medId, result.length); assertEquals("med and up, not max", maxId - medId, result.length);
result = search.search(csrq("id", minIP, medIP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, medIP, F, T), numDocs).scoreDocs;
assertEquals("not min, up to med", medId - minId, result.length); assertEquals("not min, up to med", medId - minId, result.length);
// very small sets // very small sets
result = search.search(csrq("id", minIP, minIP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, minIP, F, F), numDocs).scoreDocs;
assertEquals("min,min,F,F", 0, result.length); assertEquals("min,min,F,F", 0, result.length);
result = search.search(csrq("id", minIP, minIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, minIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("min,min,F,F", 0, result.length); assertEquals("min,min,F,F", 0, result.length);
result = search.search(csrq("id", medIP, medIP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, medIP, F, F), numDocs).scoreDocs;
assertEquals("med,med,F,F", 0, result.length); assertEquals("med,med,F,F", 0, result.length);
result = search.search(csrq("id", medIP, medIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, medIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("med,med,F,F", 0, result.length); assertEquals("med,med,F,F", 0, result.length);
result = search.search(csrq("id", maxIP, maxIP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("id", maxIP, maxIP, F, F), numDocs).scoreDocs;
assertEquals("max,max,F,F", 0, result.length); assertEquals("max,max,F,F", 0, result.length);
result = search.search(csrq("id", maxIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", maxIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("max,max,F,F", 0, result.length); assertEquals("max,max,F,F", 0, result.length);
result = search.search(csrq("id", minIP, minIP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, minIP, T, T), numDocs).scoreDocs;
assertEquals("min,min,T,T", 1, result.length); assertEquals("min,min,T,T", 1, result.length);
result = search.search(csrq("id", minIP, minIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", minIP, minIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("min,min,T,T", 1, result.length); assertEquals("min,min,T,T", 1, result.length);
result = search.search(csrq("id", null, minIP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("id", null, minIP, F, T), numDocs).scoreDocs;
assertEquals("nul,min,F,T", 1, result.length); assertEquals("nul,min,F,T", 1, result.length);
result = search.search(csrq("id", null, minIP, F, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", null, minIP, F, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("nul,min,F,T", 1, result.length); assertEquals("nul,min,F,T", 1, result.length);
result = search.search(csrq("id", maxIP, maxIP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("id", maxIP, maxIP, T, T), numDocs).scoreDocs;
assertEquals("max,max,T,T", 1, result.length); assertEquals("max,max,T,T", 1, result.length);
result = search.search(csrq("id", maxIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", maxIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("max,max,T,T", 1, result.length); assertEquals("max,max,T,T", 1, result.length);
result = search.search(csrq("id", maxIP, null, T, F), null, numDocs).scoreDocs; result = search.search(csrq("id", maxIP, null, T, F), numDocs).scoreDocs;
assertEquals("max,nul,T,T", 1, result.length); assertEquals("max,nul,T,T", 1, result.length);
result = search.search(csrq("id", maxIP, null, T, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", maxIP, null, T, F, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("max,nul,T,T", 1, result.length); assertEquals("max,nul,T,T", 1, result.length);
result = search.search(csrq("id", medIP, medIP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, medIP, T, T), numDocs).scoreDocs;
assertEquals("med,med,T,T", 1, result.length); assertEquals("med,med,T,T", 1, result.length);
result = search.search(csrq("id", medIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), null, numDocs).scoreDocs; result = search.search(csrq("id", medIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE), numDocs).scoreDocs;
assertEquals("med,med,T,T", 1, result.length); assertEquals("med,med,T,T", 1, result.length);
} }
@ -469,47 +469,47 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
// test extremes, bounded on both ends // test extremes, bounded on both ends
result = search.search(csrq("rand", minRP, maxRP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, maxRP, T, T), numDocs).scoreDocs;
assertEquals("find all", numDocs, result.length); assertEquals("find all", numDocs, result.length);
result = search.search(csrq("rand", minRP, maxRP, T, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, maxRP, T, F), numDocs).scoreDocs;
assertEquals("all but biggest", numDocs - 1, result.length); assertEquals("all but biggest", numDocs - 1, result.length);
result = search.search(csrq("rand", minRP, maxRP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, maxRP, F, T), numDocs).scoreDocs;
assertEquals("all but smallest", numDocs - 1, result.length); assertEquals("all but smallest", numDocs - 1, result.length);
result = search.search(csrq("rand", minRP, maxRP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, maxRP, F, F), numDocs).scoreDocs;
assertEquals("all but extremes", numDocs - 2, result.length); assertEquals("all but extremes", numDocs - 2, result.length);
// unbounded // unbounded
result = search.search(csrq("rand", minRP, null, T, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, null, T, F), numDocs).scoreDocs;
assertEquals("smallest and up", numDocs, result.length); assertEquals("smallest and up", numDocs, result.length);
result = search.search(csrq("rand", null, maxRP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("rand", null, maxRP, F, T), numDocs).scoreDocs;
assertEquals("biggest and down", numDocs, result.length); assertEquals("biggest and down", numDocs, result.length);
result = search.search(csrq("rand", minRP, null, F, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, null, F, F), numDocs).scoreDocs;
assertEquals("not smallest, but up", numDocs - 1, result.length); assertEquals("not smallest, but up", numDocs - 1, result.length);
result = search.search(csrq("rand", null, maxRP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", null, maxRP, F, F), numDocs).scoreDocs;
assertEquals("not biggest, but down", numDocs - 1, result.length); assertEquals("not biggest, but down", numDocs - 1, result.length);
// very small sets // very small sets
result = search.search(csrq("rand", minRP, minRP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, minRP, F, F), numDocs).scoreDocs;
assertEquals("min,min,F,F", 0, result.length); assertEquals("min,min,F,F", 0, result.length);
result = search.search(csrq("rand", maxRP, maxRP, F, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", maxRP, maxRP, F, F), numDocs).scoreDocs;
assertEquals("max,max,F,F", 0, result.length); assertEquals("max,max,F,F", 0, result.length);
result = search.search(csrq("rand", minRP, minRP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("rand", minRP, minRP, T, T), numDocs).scoreDocs;
assertEquals("min,min,T,T", 1, result.length); assertEquals("min,min,T,T", 1, result.length);
result = search.search(csrq("rand", null, minRP, F, T), null, numDocs).scoreDocs; result = search.search(csrq("rand", null, minRP, F, T), numDocs).scoreDocs;
assertEquals("nul,min,F,T", 1, result.length); assertEquals("nul,min,F,T", 1, result.length);
result = search.search(csrq("rand", maxRP, maxRP, T, T), null, numDocs).scoreDocs; result = search.search(csrq("rand", maxRP, maxRP, T, T), numDocs).scoreDocs;
assertEquals("max,max,T,T", 1, result.length); assertEquals("max,max,T,T", 1, result.length);
result = search.search(csrq("rand", maxRP, null, T, F), null, numDocs).scoreDocs; result = search.search(csrq("rand", maxRP, null, T, F), numDocs).scoreDocs;
assertEquals("max,nul,T,T", 1, result.length); assertEquals("max,nul,T,T", 1, result.length);
} }
} }

2
lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java
View File

@ -80,7 +80,7 @@ public class TestNeedsScores extends LuceneTestCase {
Query query = new MatchAllDocsQuery(); Query query = new MatchAllDocsQuery();
Query term = new TermQuery(new Term("field", "this")); Query term = new TermQuery(new Term("field", "this"));
Filter filter = new QueryWrapperFilter(new AssertNeedsScores(term, false)); Filter filter = new QueryWrapperFilter(new AssertNeedsScores(term, false));
assertEquals(5, searcher.search(query, filter, 5).totalHits); assertEquals(5, searcher.search(new FilteredQuery(query, filter), 5).totalHits);
} }
/** when not sorting by score */ /** when not sorting by score */

2
lucene/core/src/test/org/apache/lucene/search/TestNot.java
View File

@ -48,7 +48,7 @@ public class TestNot extends LuceneTestCase {
query.add(new TermQuery(new Term("field", "a")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("field", "a")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("field", "b")), BooleanClause.Occur.MUST_NOT); query.add(new TermQuery(new Term("field", "b")), BooleanClause.Occur.MUST_NOT);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
writer.close(); writer.close();
reader.close(); reader.close();

16
lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
View File

@ -158,16 +158,16 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
case 0: case 0:
type = " (constant score filter rewrite)"; type = " (constant score filter rewrite)";
q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE); q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
break; break;
case 1: case 1:
type = " (constant score boolean rewrite)"; type = " (constant score boolean rewrite)";
q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE); q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
break; break;
case 2: case 2:
type = " (filter)"; type = " (filter)";
topDocs = searcher.search(new MatchAllDocsQuery(), f, noDocs, Sort.INDEXORDER); topDocs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), f), noDocs, Sort.INDEXORDER);
break; break;
default: default:
return; return;
@ -222,7 +222,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
int count=3000; int count=3000;
int upper=(count-1)*distance + (distance/3) + startOffset; int upper=(count-1)*distance + (distance/3) + startOffset;
NumericRangeQuery<Integer> q=NumericRangeQuery.newIntRange(field, precisionStep, null, upper, true, true); NumericRangeQuery<Integer> q=NumericRangeQuery.newIntRange(field, precisionStep, null, upper, true, true);
TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); TopDocs topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
ScoreDoc[] sd = topDocs.scoreDocs; ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", count, sd.length ); assertEquals("Score doc count", count, sd.length );
@ -232,7 +232,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().intValue()); assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().intValue());
q=NumericRangeQuery.newIntRange(field, precisionStep, null, upper, false, true); q=NumericRangeQuery.newIntRange(field, precisionStep, null, upper, false, true);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
sd = topDocs.scoreDocs; sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", count, sd.length ); assertEquals("Score doc count", count, sd.length );
@ -262,7 +262,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
int count=3000; int count=3000;
int lower=(count-1)*distance + (distance/3) +startOffset; int lower=(count-1)*distance + (distance/3) +startOffset;
NumericRangeQuery<Integer> q=NumericRangeQuery.newIntRange(field, precisionStep, lower, null, true, true); NumericRangeQuery<Integer> q=NumericRangeQuery.newIntRange(field, precisionStep, lower, null, true, true);
TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); TopDocs topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
ScoreDoc[] sd = topDocs.scoreDocs; ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length ); assertEquals("Score doc count", noDocs-count, sd.length );
@ -272,7 +272,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().intValue()); assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().intValue());
q=NumericRangeQuery.newIntRange(field, precisionStep, lower, null, true, false); q=NumericRangeQuery.newIntRange(field, precisionStep, lower, null, true, false);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
sd = topDocs.scoreDocs; sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length ); assertEquals("Score doc count", noDocs-count, sd.length );
@ -550,7 +550,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
Filter tf=NumericRangeFilter.newFloatRange(field, precisionStep, Filter tf=NumericRangeFilter.newFloatRange(field, precisionStep,
NumericUtils.sortableIntToFloat(lower), NumericUtils.sortableIntToFloat(upper), true, true); NumericUtils.sortableIntToFloat(lower), NumericUtils.sortableIntToFloat(upper), true, true);
tTopDocs = searcher.search(new MatchAllDocsQuery(), tf, 1); tTopDocs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), tf), 1);
assertEquals("Returned count of range filter must be equal to inclusive range length", upper-lower+1, tTopDocs.totalHits ); assertEquals("Returned count of range filter must be equal to inclusive range length", upper-lower+1, tTopDocs.totalHits );
} }

16
lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
View File

@ -167,16 +167,16 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
case 0: case 0:
type = " (constant score filter rewrite)"; type = " (constant score filter rewrite)";
q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE); q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
break; break;
case 1: case 1:
type = " (constant score boolean rewrite)"; type = " (constant score boolean rewrite)";
q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE); q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
break; break;
case 2: case 2:
type = " (filter)"; type = " (filter)";
topDocs = searcher.search(new MatchAllDocsQuery(), f, noDocs, Sort.INDEXORDER); topDocs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), f), noDocs, Sort.INDEXORDER);
break; break;
default: default:
return; return;
@ -239,7 +239,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
int count=3000; int count=3000;
long upper=(count-1)*distance + (distance/3) + startOffset; long upper=(count-1)*distance + (distance/3) + startOffset;
NumericRangeQuery<Long> q=NumericRangeQuery.newLongRange(field, precisionStep, null, upper, true, true); NumericRangeQuery<Long> q=NumericRangeQuery.newLongRange(field, precisionStep, null, upper, true, true);
TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); TopDocs topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
ScoreDoc[] sd = topDocs.scoreDocs; ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", count, sd.length ); assertEquals("Score doc count", count, sd.length );
@ -249,7 +249,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().longValue() ); assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().longValue() );
q=NumericRangeQuery.newLongRange(field, precisionStep, null, upper, false, true); q=NumericRangeQuery.newLongRange(field, precisionStep, null, upper, false, true);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
sd = topDocs.scoreDocs; sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", count, sd.length ); assertEquals("Score doc count", count, sd.length );
@ -284,7 +284,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
int count=3000; int count=3000;
long lower=(count-1)*distance + (distance/3) +startOffset; long lower=(count-1)*distance + (distance/3) +startOffset;
NumericRangeQuery<Long> q=NumericRangeQuery.newLongRange(field, precisionStep, lower, null, true, true); NumericRangeQuery<Long> q=NumericRangeQuery.newLongRange(field, precisionStep, lower, null, true, true);
TopDocs topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); TopDocs topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
ScoreDoc[] sd = topDocs.scoreDocs; ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length ); assertEquals("Score doc count", noDocs-count, sd.length );
@ -294,7 +294,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().longValue() ); assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().longValue() );
q=NumericRangeQuery.newLongRange(field, precisionStep, lower, null, true, false); q=NumericRangeQuery.newLongRange(field, precisionStep, lower, null, true, false);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER); topDocs = searcher.search(q, noDocs, Sort.INDEXORDER);
sd = topDocs.scoreDocs; sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length ); assertEquals("Score doc count", noDocs-count, sd.length );
@ -587,7 +587,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
Filter tf=NumericRangeFilter.newDoubleRange(field, precisionStep, Filter tf=NumericRangeFilter.newDoubleRange(field, precisionStep,
NumericUtils.sortableLongToDouble(lower), NumericUtils.sortableLongToDouble(upper), true, true); NumericUtils.sortableLongToDouble(lower), NumericUtils.sortableLongToDouble(upper), true, true);
tTopDocs = searcher.search(new MatchAllDocsQuery(), tf, 1); tTopDocs = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), tf), 1);
assertEquals("Returned count of range filter must be equal to inclusive range length", upper-lower+1, tTopDocs.totalHits ); assertEquals("Returned count of range filter must be equal to inclusive range length", upper-lower+1, tTopDocs.totalHits );
} }

4
lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
View File

@ -88,10 +88,10 @@ public class TestPhrasePrefixQuery extends LuceneTestCase {
query2.add(termsWithPrefix.toArray(new Term[0])); query2.add(termsWithPrefix.toArray(new Term[0]));
ScoreDoc[] result; ScoreDoc[] result;
result = searcher.search(query1, null, 1000).scoreDocs; result = searcher.search(query1, 1000).scoreDocs;
assertEquals(2, result.length); assertEquals(2, result.length);
result = searcher.search(query2, null, 1000).scoreDocs; result = searcher.search(query2, 1000).scoreDocs;
assertEquals(0, result.length); assertEquals(0, result.length);
reader.close(); reader.close();
indexStore.close(); indexStore.close();

66
lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
View File

@ -113,7 +113,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(2); query.setSlop(2);
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
query.add(new Term("field", "five")); query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }
@ -122,7 +122,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(3); query.setSlop(3);
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
query.add(new Term("field", "five")); query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }
@ -134,7 +134,7 @@ public class TestPhraseQuery extends LuceneTestCase {
// slop is zero by default // slop is zero by default
query.add(new Term("field", "four")); query.add(new Term("field", "four"));
query.add(new Term("field", "five")); query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("exact match", 1, hits.length); assertEquals("exact match", 1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -142,7 +142,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query = new PhraseQuery(); query = new PhraseQuery();
query.add(new Term("field", "two")); query.add(new Term("field", "two"));
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("reverse not exact", 0, hits.length); assertEquals("reverse not exact", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }
@ -152,7 +152,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(1); query.setSlop(1);
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
query.add(new Term("field", "two")); query.add(new Term("field", "two"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("in order", 1, hits.length); assertEquals("in order", 1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -163,7 +163,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(1); query.setSlop(1);
query.add(new Term("field", "two")); query.add(new Term("field", "two"));
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("reversed, slop not 2 or more", 0, hits.length); assertEquals("reversed, slop not 2 or more", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }
@ -175,7 +175,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(2); // must be at least two for reverse order match query.setSlop(2); // must be at least two for reverse order match
query.add(new Term("field", "two")); query.add(new Term("field", "two"));
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length); assertEquals("just sloppy enough", 1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -184,7 +184,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(2); query.setSlop(2);
query.add(new Term("field", "three")); query.add(new Term("field", "three"));
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("not sloppy enough", 0, hits.length); assertEquals("not sloppy enough", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -199,7 +199,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
query.add(new Term("field", "three")); query.add(new Term("field", "three"));
query.add(new Term("field", "five")); query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("two total moves", 1, hits.length); assertEquals("two total moves", 1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -209,13 +209,13 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("field", "five")); query.add(new Term("field", "five"));
query.add(new Term("field", "three")); query.add(new Term("field", "three"));
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("slop of 5 not close enough", 0, hits.length); assertEquals("slop of 5 not close enough", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
query.setSlop(6); query.setSlop(6);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("slop of 6 just right", 1, hits.length); assertEquals("slop of 6 just right", 1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -238,7 +238,7 @@ public class TestPhraseQuery extends LuceneTestCase {
PhraseQuery query = new PhraseQuery(); PhraseQuery query = new PhraseQuery();
query.add(new Term("field","stop")); query.add(new Term("field","stop"));
query.add(new Term("field","words")); query.add(new Term("field","words"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -267,7 +267,7 @@ public class TestPhraseQuery extends LuceneTestCase {
PhraseQuery phraseQuery = new PhraseQuery(); PhraseQuery phraseQuery = new PhraseQuery();
phraseQuery.add(new Term("source", "marketing")); phraseQuery.add(new Term("source", "marketing"));
phraseQuery.add(new Term("source", "info")); phraseQuery.add(new Term("source", "info"));
ScoreDoc[] hits = searcher.search(phraseQuery, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(phraseQuery, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
QueryUtils.check(random(), phraseQuery,searcher); QueryUtils.check(random(), phraseQuery,searcher);
@ -276,7 +276,7 @@ public class TestPhraseQuery extends LuceneTestCase {
BooleanQuery booleanQuery = new BooleanQuery(); BooleanQuery booleanQuery = new BooleanQuery();
booleanQuery.add(termQuery, BooleanClause.Occur.MUST); booleanQuery.add(termQuery, BooleanClause.Occur.MUST);
booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST); booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST);
hits = searcher.search(booleanQuery, null, 1000).scoreDocs; hits = searcher.search(booleanQuery, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
QueryUtils.check(random(), termQuery,searcher); QueryUtils.check(random(), termQuery,searcher);
@ -307,22 +307,22 @@ public class TestPhraseQuery extends LuceneTestCase {
phraseQuery.add(new Term("contents","map")); phraseQuery.add(new Term("contents","map"));
phraseQuery.add(new Term("contents","entry")); phraseQuery.add(new Term("contents","entry"));
hits = searcher.search(termQuery, null, 1000).scoreDocs; hits = searcher.search(termQuery, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
hits = searcher.search(phraseQuery, null, 1000).scoreDocs; hits = searcher.search(phraseQuery, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
booleanQuery = new BooleanQuery(); booleanQuery = new BooleanQuery();
booleanQuery.add(termQuery, BooleanClause.Occur.MUST); booleanQuery.add(termQuery, BooleanClause.Occur.MUST);
booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST); booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST);
hits = searcher.search(booleanQuery, null, 1000).scoreDocs; hits = searcher.search(booleanQuery, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
booleanQuery = new BooleanQuery(); booleanQuery = new BooleanQuery();
booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST); booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST);
booleanQuery.add(termQuery, BooleanClause.Occur.MUST); booleanQuery.add(termQuery, BooleanClause.Occur.MUST);
hits = searcher.search(booleanQuery, null, 1000).scoreDocs; hits = searcher.search(booleanQuery, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
QueryUtils.check(random(), booleanQuery,searcher); QueryUtils.check(random(), booleanQuery,searcher);
@ -359,7 +359,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("field", "firstname")); query.add(new Term("field", "firstname"));
query.add(new Term("field", "lastname")); query.add(new Term("field", "lastname"));
query.setSlop(Integer.MAX_VALUE); query.setSlop(Integer.MAX_VALUE);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length); assertEquals(3, hits.length);
// Make sure that those matches where the terms appear closer to // Make sure that those matches where the terms appear closer to
// each other get a higher score: // each other get a higher score:
@ -407,13 +407,13 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("repeated", "part")); query.add(new Term("repeated", "part"));
query.setSlop(100); query.setSlop(100);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("slop of 100 just right", 1, hits.length); assertEquals("slop of 100 just right", 1, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
query.setSlop(99); query.setSlop(99);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("slop of 99 not enough", 0, hits.length); assertEquals("slop of 99 not enough", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
} }
@ -426,7 +426,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("nonexist", "found")); query.add(new Term("nonexist", "found"));
query.setSlop(2); // would be found this way query.setSlop(2); // would be found this way
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("phrase without repetitions exists in 2 docs", 2, hits.length); assertEquals("phrase without repetitions exists in 2 docs", 2, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -437,7 +437,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("nonexist", "exist")); query.add(new Term("nonexist", "exist"));
query.setSlop(1); // would be found query.setSlop(1); // would be found
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("phrase with repetitions exists in two docs", 2, hits.length); assertEquals("phrase with repetitions exists in two docs", 2, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -448,7 +448,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("nonexist", "phrase")); query.add(new Term("nonexist", "phrase"));
query.setSlop(1000); // would not be found no matter how high the slop is query.setSlop(1000); // would not be found no matter how high the slop is
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("nonexisting phrase with repetitions does not exist in any doc", 0, hits.length); assertEquals("nonexisting phrase with repetitions does not exist in any doc", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -460,7 +460,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("nonexist", "exist")); query.add(new Term("nonexist", "exist"));
query.setSlop(1000); // would not be found no matter how high the slop is query.setSlop(1000); // would not be found no matter how high the slop is
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("nonexisting phrase with repetitions does not exist in any doc", 0, hits.length); assertEquals("nonexisting phrase with repetitions does not exist in any doc", 0, hits.length);
QueryUtils.check(random(), query,searcher); QueryUtils.check(random(), query,searcher);
@ -481,7 +481,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(0); // to use exact phrase scorer query.setSlop(0); // to use exact phrase scorer
query.add(new Term("field", "two")); query.add(new Term("field", "two"));
query.add(new Term("field", "three")); query.add(new Term("field", "three"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("phrase found with exact phrase scorer", 1, hits.length); assertEquals("phrase found with exact phrase scorer", 1, hits.length);
float score0 = hits[0].score; float score0 = hits[0].score;
//System.out.println("(exact) field: two three: "+score0); //System.out.println("(exact) field: two three: "+score0);
@ -489,7 +489,7 @@ public class TestPhraseQuery extends LuceneTestCase {
// search on non palyndrome, find phrase with slop 2, though no slop required here. // search on non palyndrome, find phrase with slop 2, though no slop required here.
query.setSlop(2); // to use sloppy scorer query.setSlop(2); // to use sloppy scorer
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length); assertEquals("just sloppy enough", 1, hits.length);
float score1 = hits[0].score; float score1 = hits[0].score;
//System.out.println("(sloppy) field: two three: "+score1); //System.out.println("(sloppy) field: two three: "+score1);
@ -501,7 +501,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(2); // must be at least two for both ordered and reversed to match query.setSlop(2); // must be at least two for both ordered and reversed to match
query.add(new Term("palindrome", "two")); query.add(new Term("palindrome", "two"));
query.add(new Term("palindrome", "three")); query.add(new Term("palindrome", "three"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length); assertEquals("just sloppy enough", 1, hits.length);
//float score2 = hits[0].score; //float score2 = hits[0].score;
//System.out.println("palindrome: two three: "+score2); //System.out.println("palindrome: two three: "+score2);
@ -515,7 +515,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.setSlop(2); // must be at least two for both ordered and reversed to match query.setSlop(2); // must be at least two for both ordered and reversed to match
query.add(new Term("palindrome", "three")); query.add(new Term("palindrome", "three"));
query.add(new Term("palindrome", "two")); query.add(new Term("palindrome", "two"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length); assertEquals("just sloppy enough", 1, hits.length);
//float score3 = hits[0].score; //float score3 = hits[0].score;
//System.out.println("palindrome: three two: "+score3); //System.out.println("palindrome: three two: "+score3);
@ -542,7 +542,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("field", "one")); query.add(new Term("field", "one"));
query.add(new Term("field", "two")); query.add(new Term("field", "two"));
query.add(new Term("field", "three")); query.add(new Term("field", "three"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("phrase found with exact phrase scorer", 1, hits.length); assertEquals("phrase found with exact phrase scorer", 1, hits.length);
float score0 = hits[0].score; float score0 = hits[0].score;
//System.out.println("(exact) field: one two three: "+score0); //System.out.println("(exact) field: one two three: "+score0);
@ -553,7 +553,7 @@ public class TestPhraseQuery extends LuceneTestCase {
// search on non palyndrome, find phrase with slop 3, though no slop required here. // search on non palyndrome, find phrase with slop 3, though no slop required here.
query.setSlop(4); // to use sloppy scorer query.setSlop(4); // to use sloppy scorer
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length); assertEquals("just sloppy enough", 1, hits.length);
float score1 = hits[0].score; float score1 = hits[0].score;
//System.out.println("(sloppy) field: one two three: "+score1); //System.out.println("(sloppy) field: one two three: "+score1);
@ -566,7 +566,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("palindrome", "one")); query.add(new Term("palindrome", "one"));
query.add(new Term("palindrome", "two")); query.add(new Term("palindrome", "two"));
query.add(new Term("palindrome", "three")); query.add(new Term("palindrome", "three"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
// just make sure no exc: // just make sure no exc:
searcher.explain(query, 0); searcher.explain(query, 0);
@ -585,7 +585,7 @@ public class TestPhraseQuery extends LuceneTestCase {
query.add(new Term("palindrome", "three")); query.add(new Term("palindrome", "three"));
query.add(new Term("palindrome", "two")); query.add(new Term("palindrome", "two"));
query.add(new Term("palindrome", "one")); query.add(new Term("palindrome", "one"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length); assertEquals("just sloppy enough", 1, hits.length);
//float score3 = hits[0].score; //float score3 = hits[0].score;
//System.out.println("palindrome: three two one: "+score3); //System.out.println("palindrome: three two one: "+score3);

24
lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
View File

@ -122,40 +122,40 @@ public class TestPositionIncrement extends LuceneTestCase {
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "1")); q.add(new Term("field", "1"));
q.add(new Term("field", "2")); q.add(new Term("field", "2"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// same as previous, just specify positions explicitely. // same as previous, just specify positions explicitely.
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "1"),0); q.add(new Term("field", "1"),0);
q.add(new Term("field", "2"),1); q.add(new Term("field", "2"),1);
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// specifying correct positions should find the phrase. // specifying correct positions should find the phrase.
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "1"),0); q.add(new Term("field", "1"),0);
q.add(new Term("field", "2"),2); q.add(new Term("field", "2"),2);
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "2")); q.add(new Term("field", "2"));
q.add(new Term("field", "3")); q.add(new Term("field", "3"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "3")); q.add(new Term("field", "3"));
q.add(new Term("field", "4")); q.add(new Term("field", "4"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// phrase query would find it when correct positions are specified. // phrase query would find it when correct positions are specified.
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "3"),0); q.add(new Term("field", "3"),0);
q.add(new Term("field", "4"),0); q.add(new Term("field", "4"),0);
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
// phrase query should fail for non existing searched term // phrase query should fail for non existing searched term
@ -163,38 +163,38 @@ public class TestPositionIncrement extends LuceneTestCase {
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "3"),0); q.add(new Term("field", "3"),0);
q.add(new Term("field", "9"),0); q.add(new Term("field", "9"),0);
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// multi-phrase query should succed for non existing searched term // multi-phrase query should succed for non existing searched term
// because there exist another searched terms in the same searched position. // because there exist another searched terms in the same searched position.
MultiPhraseQuery mq = new MultiPhraseQuery(); MultiPhraseQuery mq = new MultiPhraseQuery();
mq.add(new Term[]{new Term("field", "3"),new Term("field", "9")},0); mq.add(new Term[]{new Term("field", "3"),new Term("field", "9")},0);
hits = searcher.search(mq, null, 1000).scoreDocs; hits = searcher.search(mq, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "2")); q.add(new Term("field", "2"));
q.add(new Term("field", "4")); q.add(new Term("field", "4"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "3")); q.add(new Term("field", "3"));
q.add(new Term("field", "5")); q.add(new Term("field", "5"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "4")); q.add(new Term("field", "4"));
q.add(new Term("field", "5")); q.add(new Term("field", "5"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
q = new PhraseQuery(); q = new PhraseQuery();
q.add(new Term("field", "2")); q.add(new Term("field", "2"));
q.add(new Term("field", "5")); q.add(new Term("field", "5"));
hits = searcher.search(q, null, 1000).scoreDocs; hits = searcher.search(q, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
reader.close(); reader.close();

18
lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java
View File

@ -49,55 +49,55 @@ public class TestPrefixFilter extends LuceneTestCase {
PrefixFilter filter = new PrefixFilter(new Term("category", "/Computers")); PrefixFilter filter = new PrefixFilter(new Term("category", "/Computers"));
Query query = new ConstantScoreQuery(filter); Query query = new ConstantScoreQuery(filter);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(4, hits.length); assertEquals(4, hits.length);
// test middle of values // test middle of values
filter = new PrefixFilter(new Term("category", "/Computers/Mac")); filter = new PrefixFilter(new Term("category", "/Computers/Mac"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(2, hits.length); assertEquals(2, hits.length);
// test start of values // test start of values
filter = new PrefixFilter(new Term("category", "/Computers/Linux")); filter = new PrefixFilter(new Term("category", "/Computers/Linux"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
// test end of values // test end of values
filter = new PrefixFilter(new Term("category", "/Computers/Windows")); filter = new PrefixFilter(new Term("category", "/Computers/Windows"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
// test non-existant // test non-existant
filter = new PrefixFilter(new Term("category", "/Computers/ObsoleteOS")); filter = new PrefixFilter(new Term("category", "/Computers/ObsoleteOS"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// test non-existant, before values // test non-existant, before values
filter = new PrefixFilter(new Term("category", "/Computers/AAA")); filter = new PrefixFilter(new Term("category", "/Computers/AAA"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// test non-existant, after values // test non-existant, after values
filter = new PrefixFilter(new Term("category", "/Computers/ZZZ")); filter = new PrefixFilter(new Term("category", "/Computers/ZZZ"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
// test zero length prefix // test zero length prefix
filter = new PrefixFilter(new Term("category", "")); filter = new PrefixFilter(new Term("category", ""));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(4, hits.length); assertEquals(4, hits.length);
// test non existent field // test non existent field
filter = new PrefixFilter(new Term("nonexistantfield", "/Computers")); filter = new PrefixFilter(new Term("nonexistantfield", "/Computers"));
query = new ConstantScoreQuery(filter); query = new ConstantScoreQuery(filter);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
writer.close(); writer.close();

8
lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
View File

@ -85,12 +85,12 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase {
public void testPrefixQuery() throws Exception { public void testPrefixQuery() throws Exception {
Query query = new PrefixQuery(new Term(FIELD, "tang")); Query query = new PrefixQuery(new Term(FIELD, "tang"));
assertEquals("Number of matched documents", 2, assertEquals("Number of matched documents", 2,
searcher.search(query, null, 1000).totalHits); searcher.search(query, 1000).totalHits);
} }
public void testTermQuery() throws Exception { public void testTermQuery() throws Exception {
Query query = new TermQuery(new Term(FIELD, "tangfulin")); Query query = new TermQuery(new Term(FIELD, "tangfulin"));
assertEquals("Number of matched documents", 2, assertEquals("Number of matched documents", 2,
searcher.search(query, null, 1000).totalHits); searcher.search(query, 1000).totalHits);
} }
public void testTermBooleanQuery() throws Exception { public void testTermBooleanQuery() throws Exception {
BooleanQuery query = new BooleanQuery(); BooleanQuery query = new BooleanQuery();
@ -99,7 +99,7 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase {
query.add(new TermQuery(new Term(FIELD, "notexistnames")), query.add(new TermQuery(new Term(FIELD, "notexistnames")),
BooleanClause.Occur.SHOULD); BooleanClause.Occur.SHOULD);
assertEquals("Number of matched documents", 2, assertEquals("Number of matched documents", 2,
searcher.search(query, null, 1000).totalHits); searcher.search(query, 1000).totalHits);
} }
public void testPrefixBooleanQuery() throws Exception { public void testPrefixBooleanQuery() throws Exception {
@ -109,6 +109,6 @@ public class TestPrefixInBooleanQuery extends LuceneTestCase {
query.add(new TermQuery(new Term(FIELD, "notexistnames")), query.add(new TermQuery(new Term(FIELD, "notexistnames")),
BooleanClause.Occur.SHOULD); BooleanClause.Occur.SHOULD);
assertEquals("Number of matched documents", 2, assertEquals("Number of matched documents", 2,
searcher.search(query, null, 1000).totalHits); searcher.search(query, 1000).totalHits);
} }
} }

6
lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
View File

@ -48,17 +48,17 @@ public class TestPrefixQuery extends LuceneTestCase {
PrefixQuery query = new PrefixQuery(new Term("category", "/Computers")); PrefixQuery query = new PrefixQuery(new Term("category", "/Computers"));
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("All documents in /Computers category and below", 3, hits.length); assertEquals("All documents in /Computers category and below", 3, hits.length);
query = new PrefixQuery(new Term("category", "/Computers/Mac")); query = new PrefixQuery(new Term("category", "/Computers/Mac"));
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("One in /Computers/Mac", 1, hits.length); assertEquals("One in /Computers/Mac", 1, hits.length);
query = new PrefixQuery(new Term("category", "")); query = new PrefixQuery(new Term("category", ""));
Terms terms = MultiFields.getTerms(searcher.getIndexReader(), "category"); Terms terms = MultiFields.getTerms(searcher.getIndexReader(), "category");
assertFalse(query.getTermsEnum(terms) instanceof PrefixTermsEnum); assertFalse(query.getTermsEnum(terms) instanceof PrefixTermsEnum);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("everything", 3, hits.length); assertEquals("everything", 3, hits.length);
writer.close(); writer.close();
reader.close(); reader.close();

22
lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
View File

@ -46,9 +46,9 @@ public class TestQueryWrapperFilter extends LuceneTestCase {
QueryWrapperFilter qwf = new QueryWrapperFilter(termQuery); QueryWrapperFilter qwf = new QueryWrapperFilter(termQuery);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
TopDocs hits = searcher.search(new MatchAllDocsQuery(), qwf, 10); TopDocs hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), qwf), 10);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
hits = searcher.search(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf), 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf)), 10);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
// should not throw exception with complex primitive query // should not throw exception with complex primitive query
@ -58,26 +58,26 @@ public class TestQueryWrapperFilter extends LuceneTestCase {
Occur.MUST_NOT); Occur.MUST_NOT);
qwf = new QueryWrapperFilter(termQuery); qwf = new QueryWrapperFilter(termQuery);
hits = searcher.search(new MatchAllDocsQuery(), qwf, 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), qwf), 10);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
hits = searcher.search(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf), 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf)), 10);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
// should not throw exception with non primitive Query (doesn't implement // should not throw exception with non primitive Query (doesn't implement
// Query#createWeight) // Query#createWeight)
qwf = new QueryWrapperFilter(new FuzzyQuery(new Term("field", "valu"))); qwf = new QueryWrapperFilter(new FuzzyQuery(new Term("field", "valu")));
hits = searcher.search(new MatchAllDocsQuery(), qwf, 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), qwf), 10);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
hits = searcher.search(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf), 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf)), 10);
assertEquals(1, hits.totalHits); assertEquals(1, hits.totalHits);
// test a query with no hits // test a query with no hits
termQuery = new TermQuery(new Term("field", "not_exist")); termQuery = new TermQuery(new Term("field", "not_exist"));
qwf = new QueryWrapperFilter(termQuery); qwf = new QueryWrapperFilter(termQuery);
hits = searcher.search(new MatchAllDocsQuery(), qwf, 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), qwf), 10);
assertEquals(0, hits.totalHits); assertEquals(0, hits.totalHits);
hits = searcher.search(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf), 10); hits = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), new CachingWrapperFilter(qwf)), 10);
assertEquals(0, hits.totalHits); assertEquals(0, hits.totalHits);
reader.close(); reader.close();
dir.close(); dir.close();
@ -113,8 +113,8 @@ public class TestQueryWrapperFilter extends LuceneTestCase {
final IndexReader r = w.getReader(); final IndexReader r = w.getReader();
w.close(); w.close();
final TopDocs hits = newSearcher(r).search(new MatchAllDocsQuery(), final TopDocs hits = newSearcher(r).search(new FilteredQuery(new MatchAllDocsQuery(),
new QueryWrapperFilter(new TermQuery(new Term("field", "a"))), new QueryWrapperFilter(new TermQuery(new Term("field", "a")))),
numDocs); numDocs);
assertEquals(aDocs.size(), hits.totalHits); assertEquals(aDocs.size(), hits.totalHits);
for(ScoreDoc sd: hits.scoreDocs) { for(ScoreDoc sd: hits.scoreDocs) {
@ -141,7 +141,7 @@ public class TestQueryWrapperFilter extends LuceneTestCase {
for (int i = 0; i < 1000; i++) { for (int i = 0; i < 1000; i++) {
TermQuery termQuery = new TermQuery(new Term("field", English.intToEnglish(i))); TermQuery termQuery = new TermQuery(new Term("field", English.intToEnglish(i)));
QueryWrapperFilter qwf = new QueryWrapperFilter(termQuery); QueryWrapperFilter qwf = new QueryWrapperFilter(termQuery);
TopDocs td = searcher.search(new MatchAllDocsQuery(), qwf, 10); TopDocs td = searcher.search(new FilteredQuery(new MatchAllDocsQuery(), qwf), 10);
assertEquals(1, td.totalHits); assertEquals(1, td.totalHits);
} }

31
lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
View File

@ -180,11 +180,8 @@ public class TestSearchAfter extends LuceneTestCase {
// pages. // pages.
int n = atLeast(20); int n = atLeast(20);
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
Filter odd = new QueryWrapperFilter(new TermQuery(new Term("oddeven", "odd")));
assertQuery(new MatchAllDocsQuery(), null); assertQuery(new MatchAllDocsQuery(), null);
assertQuery(new TermQuery(new Term("english", "one")), null); assertQuery(new TermQuery(new Term("english", "one")), null);
assertQuery(new MatchAllDocsQuery(), odd);
assertQuery(new TermQuery(new Term("english", "four")), odd);
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD); bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD);
bq.add(new TermQuery(new Term("oddeven", "even")), BooleanClause.Occur.SHOULD); bq.add(new TermQuery(new Term("oddeven", "even")), BooleanClause.Occur.SHOULD);
@ -192,15 +189,15 @@ public class TestSearchAfter extends LuceneTestCase {
} }
} }
void assertQuery(Query query, Filter filter) throws Exception { void assertQuery(Query query) throws Exception {
assertQuery(query, filter, null); assertQuery(query, null);
assertQuery(query, filter, Sort.RELEVANCE); assertQuery(query, Sort.RELEVANCE);
assertQuery(query, filter, Sort.INDEXORDER); assertQuery(query, Sort.INDEXORDER);
for(SortField sortField : allSortFields) { for(SortField sortField : allSortFields) {
assertQuery(query, filter, new Sort(new SortField[] {sortField})); assertQuery(query, new Sort(new SortField[] {sortField}));
} }
for(int i=0;i<20;i++) { for(int i=0;i<20;i++) {
assertQuery(query, filter, getRandomSort()); assertQuery(query, getRandomSort());
} }
} }
@ -212,21 +209,21 @@ public class TestSearchAfter extends LuceneTestCase {
return new Sort(sortFields); return new Sort(sortFields);
} }
void assertQuery(Query query, Filter filter, Sort sort) throws Exception { void assertQuery(Query query, Sort sort) throws Exception {
int maxDoc = searcher.getIndexReader().maxDoc(); int maxDoc = searcher.getIndexReader().maxDoc();
TopDocs all; TopDocs all;
int pageSize = TestUtil.nextInt(random(), 1, maxDoc * 2); int pageSize = TestUtil.nextInt(random(), 1, maxDoc * 2);
if (VERBOSE) { if (VERBOSE) {
System.out.println("\nassertQuery " + (iter++) + ": query=" + query + " filter=" + filter + " sort=" + sort + " pageSize=" + pageSize); System.out.println("\nassertQuery " + (iter++) + ": query=" + query + " sort=" + sort + " pageSize=" + pageSize);
} }
final boolean doMaxScore = random().nextBoolean(); final boolean doMaxScore = random().nextBoolean();
final boolean doScores = random().nextBoolean(); final boolean doScores = random().nextBoolean();
if (sort == null) { if (sort == null) {
all = searcher.search(query, filter, maxDoc); all = searcher.search(query, maxDoc);
} else if (sort == Sort.RELEVANCE) { } else if (sort == Sort.RELEVANCE) {
all = searcher.search(query, filter, maxDoc, sort, true, doMaxScore); all = searcher.search(query, maxDoc, sort, true, doMaxScore);
} else { } else {
all = searcher.search(query, filter, maxDoc, sort, doScores, doMaxScore); all = searcher.search(query, maxDoc, sort, doScores, doMaxScore);
} }
if (VERBOSE) { if (VERBOSE) {
System.out.println(" all.totalHits=" + all.totalHits); System.out.println(" all.totalHits=" + all.totalHits);
@ -243,15 +240,15 @@ public class TestSearchAfter extends LuceneTestCase {
if (VERBOSE) { if (VERBOSE) {
System.out.println(" iter lastBottom=" + lastBottom); System.out.println(" iter lastBottom=" + lastBottom);
} }
paged = searcher.searchAfter(lastBottom, query, filter, pageSize); paged = searcher.searchAfter(lastBottom, query, pageSize);
} else { } else {
if (VERBOSE) { if (VERBOSE) {
System.out.println(" iter lastBottom=" + lastBottom); System.out.println(" iter lastBottom=" + lastBottom);
} }
if (sort == Sort.RELEVANCE) { if (sort == Sort.RELEVANCE) {
paged = searcher.searchAfter(lastBottom, query, filter, pageSize, sort, true, doMaxScore); paged = searcher.searchAfter(lastBottom, query, pageSize, sort, true, doMaxScore);
} else { } else {
paged = searcher.searchAfter(lastBottom, query, filter, pageSize, sort, doScores, doMaxScore); paged = searcher.searchAfter(lastBottom, query, pageSize, sort, doScores, doMaxScore);
} }
} }
if (VERBOSE) { if (VERBOSE) {

11
lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
View File

@ -148,7 +148,7 @@ public class TestSortRandom extends LuceneTestCase {
} }
final int hitCount = TestUtil.nextInt(random, 1, r.maxDoc() + 20); final int hitCount = TestUtil.nextInt(random, 1, r.maxDoc() + 20);
final RandomFilter f = new RandomFilter(random, random.nextFloat(), docValues); final RandomFilter f = new RandomFilter(random, random.nextFloat(), docValues);
int queryType = random.nextInt(3); int queryType = random.nextInt(2);
if (queryType == 0) { if (queryType == 0) {
// force out of order // force out of order
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
@ -158,13 +158,10 @@ public class TestSortRandom extends LuceneTestCase {
// Set minNrShouldMatch to 1 so that BQ will not optimize rewrite to return // Set minNrShouldMatch to 1 so that BQ will not optimize rewrite to return
// the clause instead of BQ. // the clause instead of BQ.
bq.setMinimumNumberShouldMatch(1); bq.setMinimumNumberShouldMatch(1);
hits = s.search(bq, f, hitCount, sort, random.nextBoolean(), random.nextBoolean()); hits = s.search(new FilteredQuery(bq, f), hitCount, sort, random.nextBoolean(), random.nextBoolean());
} else if (queryType == 1) {
hits = s.search(new ConstantScoreQuery(f),
null, hitCount, sort, random.nextBoolean(), random.nextBoolean());
} else { } else {
hits = s.search(new MatchAllDocsQuery(), hits = s.search(new ConstantScoreQuery(f),
f, hitCount, sort, random.nextBoolean(), random.nextBoolean()); hitCount, sort, random.nextBoolean(), random.nextBoolean());
} }
if (VERBOSE) { if (VERBOSE) {

4
lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
View File

@ -37,13 +37,13 @@ public class TestSortedNumericSortField extends LuceneTestCase {
Sort sort = new Sort(); Sort sort = new Sort();
sort.setSort(new SortedNumericSortField("sortednumeric", SortField.Type.LONG)); sort.setSort(new SortedNumericSortField("sortednumeric", SortField.Type.LONG));
TopDocs td = empty.search(query, null, 10, sort, true, true); TopDocs td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
// for an empty index, any selector should work // for an empty index, any selector should work
for (SortedNumericSelector.Type v : SortedNumericSelector.Type.values()) { for (SortedNumericSelector.Type v : SortedNumericSelector.Type.values()) {
sort.setSort(new SortedNumericSortField("sortednumeric", SortField.Type.LONG, false, v)); sort.setSort(new SortedNumericSortField("sortednumeric", SortField.Type.LONG, false, v));
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
} }
} }

4
lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
View File

@ -37,13 +37,13 @@ public class TestSortedSetSortField extends LuceneTestCase {
Sort sort = new Sort(); Sort sort = new Sort();
sort.setSort(new SortedSetSortField("sortedset", false)); sort.setSort(new SortedSetSortField("sortedset", false));
TopDocs td = empty.search(query, null, 10, sort, true, true); TopDocs td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
// for an empty index, any selector should work // for an empty index, any selector should work
for (SortedSetSelector.Type v : SortedSetSelector.Type.values()) { for (SortedSetSelector.Type v : SortedSetSelector.Type.values()) {
sort.setSort(new SortedSetSortField("sortedset", false, v)); sort.setSort(new SortedSetSortField("sortedset", false, v));
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
} }
} }

6
lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
View File

@ -124,7 +124,7 @@ public class TestSubScorerFreqs extends LuceneTestCase {
public void testTermQuery() throws Exception { public void testTermQuery() throws Exception {
TermQuery q = new TermQuery(new Term("f", "d")); TermQuery q = new TermQuery(new Term("f", "d"));
CountingCollector c = new CountingCollector(TopScoreDocCollector.create(10)); CountingCollector c = new CountingCollector(TopScoreDocCollector.create(10));
s.search(q, null, c); s.search(q, c);
final int maxDocs = s.getIndexReader().maxDoc(); final int maxDocs = s.getIndexReader().maxDoc();
assertEquals(maxDocs, c.docCounts.size()); assertEquals(maxDocs, c.docCounts.size());
for (int i = 0; i < maxDocs; i++) { for (int i = 0; i < maxDocs; i++) {
@ -164,7 +164,7 @@ public class TestSubScorerFreqs extends LuceneTestCase {
for (final Set<String> occur : occurList) { for (final Set<String> occur : occurList) {
CountingCollector c = new CountingCollector(TopScoreDocCollector.create( CountingCollector c = new CountingCollector(TopScoreDocCollector.create(
10), occur); 10), occur);
s.search(query, null, c); s.search(query, c);
final int maxDocs = s.getIndexReader().maxDoc(); final int maxDocs = s.getIndexReader().maxDoc();
assertEquals(maxDocs, c.docCounts.size()); assertEquals(maxDocs, c.docCounts.size());
boolean includeOptional = occur.contains("SHOULD"); boolean includeOptional = occur.contains("SHOULD");
@ -196,7 +196,7 @@ public class TestSubScorerFreqs extends LuceneTestCase {
q.add(new Term("f", "b")); q.add(new Term("f", "b"));
q.add(new Term("f", "c")); q.add(new Term("f", "c"));
CountingCollector c = new CountingCollector(TopScoreDocCollector.create(10)); CountingCollector c = new CountingCollector(TopScoreDocCollector.create(10));
s.search(q, null, c); s.search(q, c);
final int maxDocs = s.getIndexReader().maxDoc(); final int maxDocs = s.getIndexReader().maxDoc();
assertEquals(maxDocs, c.docCounts.size()); assertEquals(maxDocs, c.docCounts.size());
for (int i = 0; i < maxDocs; i++) { for (int i = 0; i < maxDocs; i++) {

68
lucene/core/src/test/org/apache/lucene/search/TestTermRangeFilter.java
View File

@ -54,83 +54,83 @@ public class TestTermRangeFilter extends BaseTestRangeFilter {
// test id, bounded on both ends // test id, bounded on both ends
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, maxIP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, maxIP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("find all", numDocs, result.length); assertEquals("find all", numDocs, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, maxIP, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, maxIP, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("all but last", numDocs - 1, result.length); assertEquals("all but last", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, maxIP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, maxIP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("all but first", numDocs - 1, result.length); assertEquals("all but first", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, maxIP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, maxIP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("all but ends", numDocs - 2, result.length); assertEquals("all but ends", numDocs - 2, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", medIP, maxIP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", medIP, maxIP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("med and up", 1 + maxId - medId, result.length); assertEquals("med and up", 1 + maxId - medId, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, medIP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, medIP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("up to med", 1 + medId - minId, result.length); assertEquals("up to med", 1 + medId - minId, result.length);
// unbounded id // unbounded id
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, null, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, null, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("min and up", numDocs, result.length); assertEquals("min and up", numDocs, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", null, maxIP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", null, maxIP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max and down", numDocs, result.length); assertEquals("max and down", numDocs, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, null, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, null, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("not min, but up", numDocs - 1, result.length); assertEquals("not min, but up", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", null, maxIP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", null, maxIP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("not max, but down", numDocs - 1, result.length); assertEquals("not max, but down", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", medIP, maxIP, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", medIP, maxIP, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("med and up, not max", maxId - medId, result.length); assertEquals("med and up, not max", maxId - medId, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, medIP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, medIP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("not min, up to med", medId - minId, result.length); assertEquals("not min, up to med", medId - minId, result.length);
// very small sets // very small sets
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, minIP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, minIP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("min,min,F,F", 0, result.length); assertEquals("min,min,F,F", 0, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", medIP, medIP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", medIP, medIP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("med,med,F,F", 0, result.length); assertEquals("med,med,F,F", 0, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", maxIP, maxIP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", maxIP, maxIP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max,max,F,F", 0, result.length); assertEquals("max,max,F,F", 0, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", minIP, minIP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", minIP, minIP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("min,min,T,T", 1, result.length); assertEquals("min,min,T,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", null, minIP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", null, minIP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("nul,min,F,T", 1, result.length); assertEquals("nul,min,F,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", maxIP, maxIP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", maxIP, maxIP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max,max,T,T", 1, result.length); assertEquals("max,max,T,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", maxIP, null, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", maxIP, null, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max,nul,T,T", 1, result.length); assertEquals("max,nul,T,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("id", medIP, medIP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("id", medIP, medIP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("med,med,T,T", 1, result.length); assertEquals("med,med,T,T", 1, result.length);
} }
@ -153,60 +153,60 @@ public class TestTermRangeFilter extends BaseTestRangeFilter {
// test extremes, bounded on both ends // test extremes, bounded on both ends
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("find all", numDocs, result.length); assertEquals("find all", numDocs, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("all but biggest", numDocs - 1, result.length); assertEquals("all but biggest", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("all but smallest", numDocs - 1, result.length); assertEquals("all but smallest", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, maxRP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("all but extremes", numDocs - 2, result.length); assertEquals("all but extremes", numDocs - 2, result.length);
// unbounded // unbounded
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, null, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, null, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("smallest and up", numDocs, result.length); assertEquals("smallest and up", numDocs, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", null, maxRP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", null, maxRP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("biggest and down", numDocs, result.length); assertEquals("biggest and down", numDocs, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, null, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, null, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("not smallest, but up", numDocs - 1, result.length); assertEquals("not smallest, but up", numDocs - 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", null, maxRP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", null, maxRP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("not biggest, but down", numDocs - 1, result.length); assertEquals("not biggest, but down", numDocs - 1, result.length);
// very small sets // very small sets
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, minRP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, minRP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("min,min,F,F", 0, result.length); assertEquals("min,min,F,F", 0, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", maxRP, maxRP, F, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", maxRP, maxRP, F, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max,max,F,F", 0, result.length); assertEquals("max,max,F,F", 0, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", minRP, minRP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", minRP, minRP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("min,min,T,T", 1, result.length); assertEquals("min,min,T,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", null, minRP, F, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", null, minRP, F, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("nul,min,F,T", 1, result.length); assertEquals("nul,min,F,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", maxRP, maxRP, T, T), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", maxRP, maxRP, T, T)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max,max,T,T", 1, result.length); assertEquals("max,max,T,T", 1, result.length);
result = search.search(q, TermRangeFilter.newStringRange("rand", maxRP, null, T, F), result = search.search(new FilteredQuery(q, TermRangeFilter.newStringRange("rand", maxRP, null, T, F)),
numDocs).scoreDocs; numDocs).scoreDocs;
assertEquals("max,nul,T,T", 1, result.length); assertEquals("max,nul,T,T", 1, result.length);
} }

32
lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
View File

@ -56,21 +56,21 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "C", "D"}); initializeIndex(new String[] {"A", "B", "C", "D"});
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("A,B,C,D, only B in range", 1, hits.length); assertEquals("A,B,C,D, only B in range", 1, hits.length);
reader.close(); reader.close();
initializeIndex(new String[] {"A", "B", "D"}); initializeIndex(new String[] {"A", "B", "D"});
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("A,B,D, only B in range", 1, hits.length); assertEquals("A,B,D, only B in range", 1, hits.length);
reader.close(); reader.close();
addDoc("C"); addDoc("C");
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("C added, still only B in range", 1, hits.length); assertEquals("C added, still only B in range", 1, hits.length);
reader.close(); reader.close();
} }
@ -81,21 +81,21 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[]{"A", "B", "C", "D"}); initializeIndex(new String[]{"A", "B", "C", "D"});
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("A,B,C,D - A,B,C in range", 3, hits.length); assertEquals("A,B,C,D - A,B,C in range", 3, hits.length);
reader.close(); reader.close();
initializeIndex(new String[]{"A", "B", "D"}); initializeIndex(new String[]{"A", "B", "D"});
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("A,B,D - A and B in range", 2, hits.length); assertEquals("A,B,D - A and B in range", 2, hits.length);
reader.close(); reader.close();
addDoc("C"); addDoc("C");
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(query, null, 1000).scoreDocs; hits = searcher.search(query, 1000).scoreDocs;
assertEquals("C added - A, B, C in range", 3, hits.length); assertEquals("C added - A, B, C in range", 3, hits.length);
reader.close(); reader.close();
} }
@ -107,17 +107,17 @@ public class TestTermRangeQuery extends LuceneTestCase {
TermRangeQuery query = new TermRangeQuery("content", null, null, true, true); TermRangeQuery query = new TermRangeQuery("content", null, null, true, true);
Terms terms = MultiFields.getTerms(searcher.getIndexReader(), "content"); Terms terms = MultiFields.getTerms(searcher.getIndexReader(), "content");
assertFalse(query.getTermsEnum(terms) instanceof TermRangeTermsEnum); assertFalse(query.getTermsEnum(terms) instanceof TermRangeTermsEnum);
assertEquals(4, searcher.search(query, null, 1000).scoreDocs.length); assertEquals(4, searcher.search(query, 1000).scoreDocs.length);
query = new TermRangeQuery("content", null, null, false, false); query = new TermRangeQuery("content", null, null, false, false);
assertFalse(query.getTermsEnum(terms) instanceof TermRangeTermsEnum); assertFalse(query.getTermsEnum(terms) instanceof TermRangeTermsEnum);
assertEquals(4, searcher.search(query, null, 1000).scoreDocs.length); assertEquals(4, searcher.search(query, 1000).scoreDocs.length);
query = TermRangeQuery.newStringRange("content", "", null, true, false); query = TermRangeQuery.newStringRange("content", "", null, true, false);
assertFalse(query.getTermsEnum(terms) instanceof TermRangeTermsEnum); assertFalse(query.getTermsEnum(terms) instanceof TermRangeTermsEnum);
assertEquals(4, searcher.search(query, null, 1000).scoreDocs.length); assertEquals(4, searcher.search(query, 1000).scoreDocs.length);
// and now anothe one // and now anothe one
query = TermRangeQuery.newStringRange("content", "B", null, true, false); query = TermRangeQuery.newStringRange("content", "B", null, true, false);
assertTrue(query.getTermsEnum(terms) instanceof TermRangeTermsEnum); assertTrue(query.getTermsEnum(terms) instanceof TermRangeTermsEnum);
assertEquals(3, searcher.search(query, null, 1000).scoreDocs.length); assertEquals(3, searcher.search(query, 1000).scoreDocs.length);
reader.close(); reader.close();
} }
@ -276,7 +276,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "", "C", "D"}, analyzer); initializeIndex(new String[] {"A", "B", "", "C", "D"}, analyzer);
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
int numHits = searcher.search(query, null, 1000).totalHits; int numHits = searcher.search(query, 1000).totalHits;
// When Lucene-38 is fixed, use the assert on the next line: // When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,C,D => A, B & <empty string> are in range", 3, numHits); assertEquals("A,B,<empty string>,C,D => A, B & <empty string> are in range", 3, numHits);
// until Lucene-38 is fixed, use this assert: // until Lucene-38 is fixed, use this assert:
@ -286,7 +286,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[] {"A", "B", "", "D"}, analyzer); initializeIndex(new String[] {"A", "B", "", "D"}, analyzer);
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
numHits = searcher.search(query, null, 1000).totalHits; numHits = searcher.search(query, 1000).totalHits;
// When Lucene-38 is fixed, use the assert on the next line: // When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,D => A, B & <empty string> are in range", 3, numHits); assertEquals("A,B,<empty string>,D => A, B & <empty string> are in range", 3, numHits);
// until Lucene-38 is fixed, use this assert: // until Lucene-38 is fixed, use this assert:
@ -295,7 +295,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
addDoc("C"); addDoc("C");
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
numHits = searcher.search(query, null, 1000).totalHits; numHits = searcher.search(query, 1000).totalHits;
// When Lucene-38 is fixed, use the assert on the next line: // When Lucene-38 is fixed, use the assert on the next line:
assertEquals("C added, still A, B & <empty string> are in range", 3, numHits); assertEquals("C added, still A, B & <empty string> are in range", 3, numHits);
// until Lucene-38 is fixed, use this assert // until Lucene-38 is fixed, use this assert
@ -311,7 +311,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[]{"A", "B", "","C", "D"}, analyzer); initializeIndex(new String[]{"A", "B", "","C", "D"}, analyzer);
IndexReader reader = DirectoryReader.open(dir); IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
int numHits = searcher.search(query, null, 1000).totalHits; int numHits = searcher.search(query, 1000).totalHits;
// When Lucene-38 is fixed, use the assert on the next line: // When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,C,D => A,B,<empty string>,C in range", 4, numHits); assertEquals("A,B,<empty string>,C,D => A,B,<empty string>,C in range", 4, numHits);
// until Lucene-38 is fixed, use this assert // until Lucene-38 is fixed, use this assert
@ -320,7 +320,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
initializeIndex(new String[]{"A", "B", "", "D"}, analyzer); initializeIndex(new String[]{"A", "B", "", "D"}, analyzer);
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
numHits = searcher.search(query, null, 1000).totalHits; numHits = searcher.search(query, 1000).totalHits;
// When Lucene-38 is fixed, use the assert on the next line: // When Lucene-38 is fixed, use the assert on the next line:
assertEquals("A,B,<empty string>,D - A, B and <empty string> in range", 3, numHits); assertEquals("A,B,<empty string>,D - A, B and <empty string> in range", 3, numHits);
// until Lucene-38 is fixed, use this assert // until Lucene-38 is fixed, use this assert
@ -329,7 +329,7 @@ public class TestTermRangeQuery extends LuceneTestCase {
addDoc("C"); addDoc("C");
reader = DirectoryReader.open(dir); reader = DirectoryReader.open(dir);
searcher = newSearcher(reader); searcher = newSearcher(reader);
numHits = searcher.search(query, null, 1000).totalHits; numHits = searcher.search(query, 1000).totalHits;
// When Lucene-38 is fixed, use the assert on the next line: // When Lucene-38 is fixed, use the assert on the next line:
assertEquals("C added => A,B,<empty string>,C in range", 4, numHits); assertEquals("C added => A,B,<empty string>,C in range", 4, numHits);
// until Lucene-38 is fixed, use this assert // until Lucene-38 is fixed, use this assert

2
lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
View File

@ -105,7 +105,7 @@ public class TestTimeLimitingCollector extends LuceneTestCase {
query = booleanQuery; query = booleanQuery;
// warm the searcher // warm the searcher
searcher.search(query, null, 1000); searcher.search(query, 1000);
} }
@Override @Override

2
lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
View File

@ -41,7 +41,7 @@ public class TestTotalHitCountCollector extends LuceneTestCase {
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
TotalHitCountCollector c = new TotalHitCountCollector(); TotalHitCountCollector c = new TotalHitCountCollector();
searcher.search(new MatchAllDocsQuery(), null, c); searcher.search(new MatchAllDocsQuery(), c);
assertEquals(5, c.getTotalHits()); assertEquals(5, c.getTotalHits());
reader.close(); reader.close();
indexStore.close(); indexStore.close();

10
lucene/core/src/test/org/apache/lucene/search/TestWildcard.java
View File

@ -254,7 +254,7 @@ public class TestWildcard
private void assertMatches(IndexSearcher searcher, Query q, int expectedMatches) private void assertMatches(IndexSearcher searcher, Query q, int expectedMatches)
throws IOException { throws IOException {
ScoreDoc[] result = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] result = searcher.search(q, 1000).scoreDocs;
assertEquals(expectedMatches, result.length); assertEquals(expectedMatches, result.length);
} }
@ -354,14 +354,14 @@ public class TestWildcard
// test queries that must find all // test queries that must find all
for (Query q : matchAll) { for (Query q : matchAll) {
if (VERBOSE) System.out.println("matchAll: q=" + q + " " + q.getClass().getName()); if (VERBOSE) System.out.println("matchAll: q=" + q + " " + q.getClass().getName());
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals(docs.length, hits.length); assertEquals(docs.length, hits.length);
} }
// test queries that must find none // test queries that must find none
for (Query q : matchNone) { for (Query q : matchNone) {
if (VERBOSE) System.out.println("matchNone: q=" + q + " " + q.getClass().getName()); if (VERBOSE) System.out.println("matchNone: q=" + q + " " + q.getClass().getName());
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals(0, hits.length); assertEquals(0, hits.length);
} }
@ -370,7 +370,7 @@ public class TestWildcard
for (int j = 0; j < matchOneDocPrefix[i].length; j++) { for (int j = 0; j < matchOneDocPrefix[i].length; j++) {
Query q = matchOneDocPrefix[i][j]; Query q = matchOneDocPrefix[i][j];
if (VERBOSE) System.out.println("match 1 prefix: doc="+docs[i]+" q="+q+" "+q.getClass().getName()); if (VERBOSE) System.out.println("match 1 prefix: doc="+docs[i]+" q="+q+" "+q.getClass().getName());
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1,hits.length); assertEquals(1,hits.length);
assertEquals(i,hits[0].doc); assertEquals(i,hits[0].doc);
} }
@ -381,7 +381,7 @@ public class TestWildcard
for (int j = 0; j < matchOneDocWild[i].length; j++) { for (int j = 0; j < matchOneDocWild[i].length; j++) {
Query q = matchOneDocWild[i][j]; Query q = matchOneDocWild[i][j];
if (VERBOSE) System.out.println("match 1 wild: doc="+docs[i]+" q="+q+" "+q.getClass().getName()); if (VERBOSE) System.out.println("match 1 wild: doc="+docs[i]+" q="+q+" "+q.getClass().getName());
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(q, 1000).scoreDocs;
assertEquals(1,hits.length); assertEquals(1,hits.length);
assertEquals(i,hits[0].doc); assertEquals(i,hits[0].doc);
} }

16
lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
View File

@ -141,7 +141,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
// all 10 hits should have score = 3 because adjacent terms have payloads of 2,4 // all 10 hits should have score = 3 because adjacent terms have payloads of 2,4
// and all the similarity factors are set to 1 // and all the similarity factors are set to 1
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("should be 10 hits", hits.totalHits == 10); assertTrue("should be 10 hits", hits.totalHits == 10);
for (int j = 0; j < hits.scoreDocs.length; j++) { for (int j = 0; j < hits.scoreDocs.length; j++) {
@ -155,7 +155,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
} }
// all should have score = 3 because adjacent terms have payloads of 2,4 // all should have score = 3 because adjacent terms have payloads of 2,4
// and all the similarity factors are set to 1 // and all the similarity factors are set to 1
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertEquals("should be 100 hits", 100, hits.totalHits); assertEquals("should be 100 hits", 100, hits.totalHits);
for (int j = 0; j < hits.scoreDocs.length; j++) { for (int j = 0; j < hits.scoreDocs.length; j++) {
@ -179,7 +179,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
clauses[1] = q2; clauses[1] = q2;
query = new PayloadNearQuery(clauses, 10, false); query = new PayloadNearQuery(clauses, 10, false);
//System.out.println(query.toString()); //System.out.println(query.toString());
assertEquals(12, searcher.search(query, null, 100).totalHits); assertEquals(12, searcher.search(query, 100).totalHits);
/* /*
System.out.println(hits.totalHits); System.out.println(hits.totalHits);
for (int j = 0; j < hits.scoreDocs.length; j++) { for (int j = 0; j < hits.scoreDocs.length; j++) {
@ -197,7 +197,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
QueryUtils.check(query); QueryUtils.check(query);
// all 10 hits should have score = 3 because adjacent terms have payloads of 2,4 // all 10 hits should have score = 3 because adjacent terms have payloads of 2,4
// and all the similarity factors are set to 1 // and all the similarity factors are set to 1
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("should be 10 hits", hits.totalHits == 10); assertTrue("should be 10 hits", hits.totalHits == 10);
for (int j = 0; j < hits.scoreDocs.length; j++) { for (int j = 0; j < hits.scoreDocs.length; j++) {
@ -216,7 +216,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
query = newPhraseQuery("field", "twenty two", true, new MaxPayloadFunction()); query = newPhraseQuery("field", "twenty two", true, new MaxPayloadFunction());
QueryUtils.check(query); QueryUtils.check(query);
// all 10 hits should have score = 4 (max payload value) // all 10 hits should have score = 4 (max payload value)
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("should be 10 hits", hits.totalHits == 10); assertTrue("should be 10 hits", hits.totalHits == 10);
for (int j = 0; j < hits.scoreDocs.length; j++) { for (int j = 0; j < hits.scoreDocs.length; j++) {
@ -235,7 +235,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
query = newPhraseQuery("field", "twenty two", true, new MinPayloadFunction()); query = newPhraseQuery("field", "twenty two", true, new MinPayloadFunction());
QueryUtils.check(query); QueryUtils.check(query);
// all 10 hits should have score = 2 (min payload value) // all 10 hits should have score = 2 (min payload value)
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("should be 10 hits", hits.totalHits == 10); assertTrue("should be 10 hits", hits.totalHits == 10);
for (int j = 0; j < hits.scoreDocs.length; j++) { for (int j = 0; j < hits.scoreDocs.length; j++) {
@ -269,7 +269,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
PayloadNearQuery query; PayloadNearQuery query;
TopDocs hits; TopDocs hits;
query = newPhraseQuery("field", "nine hundred ninety nine", true, new AveragePayloadFunction()); query = newPhraseQuery("field", "nine hundred ninety nine", true, new AveragePayloadFunction());
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
ScoreDoc doc = hits.scoreDocs[0]; ScoreDoc doc = hits.scoreDocs[0];
// System.out.println("Doc: " + doc.toString()); // System.out.println("Doc: " + doc.toString());
@ -291,7 +291,7 @@ public class TestPayloadNearQuery extends LuceneTestCase {
SpanQuery q4 = newPhraseQuery("field", "hundred nine", false, new AveragePayloadFunction()); SpanQuery q4 = newPhraseQuery("field", "hundred nine", false, new AveragePayloadFunction());
SpanQuery[]clauses = new SpanQuery[] {new PayloadNearQuery(new SpanQuery[] {q1,q2}, 0, true), new PayloadNearQuery(new SpanQuery[] {q3,q4}, 0, false)}; SpanQuery[]clauses = new SpanQuery[] {new PayloadNearQuery(new SpanQuery[] {q1,q2}, 0, true), new PayloadNearQuery(new SpanQuery[] {q3,q4}, 0, false)};
query = new PayloadNearQuery(clauses, 0, false); query = new PayloadNearQuery(clauses, 0, false);
hits = searcher.search(query, null, 100); hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
// should be only 1 hit - doc 999 // should be only 1 hit - doc 999
assertTrue("should only be one hit", hits.scoreDocs.length == 1); assertTrue("should only be one hit", hits.scoreDocs.length == 1);

10
lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
View File

@ -147,7 +147,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
public void test() throws IOException { public void test() throws IOException {
PayloadTermQuery query = new PayloadTermQuery(new Term("field", "seventy"), PayloadTermQuery query = new PayloadTermQuery(new Term("field", "seventy"),
new MaxPayloadFunction()); new MaxPayloadFunction());
TopDocs hits = searcher.search(query, null, 100); TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100); assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100);
@ -188,7 +188,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
public void testMultipleMatchesPerDoc() throws Exception { public void testMultipleMatchesPerDoc() throws Exception {
PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.MULTI_FIELD, "seventy"), PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.MULTI_FIELD, "seventy"),
new MaxPayloadFunction()); new MaxPayloadFunction());
TopDocs hits = searcher.search(query, null, 100); TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100); assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100);
@ -230,7 +230,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
IndexReader reader = DirectoryReader.open(directory); IndexReader reader = DirectoryReader.open(directory);
IndexSearcher theSearcher = newSearcher(reader); IndexSearcher theSearcher = newSearcher(reader);
theSearcher.setSimilarity(new FullSimilarity()); theSearcher.setSimilarity(new FullSimilarity());
TopDocs hits = searcher.search(query, null, 100); TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100); assertTrue("hits Size: " + hits.totalHits + " is not: " + 100, hits.totalHits == 100);
@ -267,7 +267,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
public void testNoMatch() throws Exception { public void testNoMatch() throws Exception {
PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.FIELD, "junk"), PayloadTermQuery query = new PayloadTermQuery(new Term(PayloadHelper.FIELD, "junk"),
new MaxPayloadFunction()); new MaxPayloadFunction());
TopDocs hits = searcher.search(query, null, 100); TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("hits Size: " + hits.totalHits + " is not: " + 0, hits.totalHits == 0); assertTrue("hits Size: " + hits.totalHits + " is not: " + 0, hits.totalHits == 0);
@ -283,7 +283,7 @@ public class TestPayloadTermQuery extends LuceneTestCase {
BooleanQuery query = new BooleanQuery(); BooleanQuery query = new BooleanQuery();
query.add(c1); query.add(c1);
query.add(c2); query.add(c2);
TopDocs hits = searcher.search(query, null, 100); TopDocs hits = searcher.search(query, 100);
assertTrue("hits is null and it shouldn't be", hits != null); assertTrue("hits is null and it shouldn't be", hits != null);
assertTrue("hits Size: " + hits.totalHits + " is not: " + 1, hits.totalHits == 1); assertTrue("hits Size: " + hits.totalHits + " is not: " + 1, hits.totalHits == 1);
int[] results = new int[1]; int[] results = new int[1];

2
lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
View File

@ -136,7 +136,7 @@ public class TestSpansAdvanced extends LuceneTestCase {
// Hits hits = searcher.search(query); // Hits hits = searcher.search(query);
// hits normalizes and throws things off if one score is greater than 1.0 // hits normalizes and throws things off if one score is greater than 1.0
TopDocs topdocs = s.search(query, null, 10000); TopDocs topdocs = s.search(query, 10000);
/***** /*****
* // display the hits System.out.println(hits.length() + * // display the hits System.out.println(hits.length() +

8
lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
View File

@ -237,7 +237,7 @@ public class TestBufferedIndexInput extends LuceneTestCase {
writer.deleteDocuments(new Term("id", "0")); writer.deleteDocuments(new Term("id", "0"));
reader = DirectoryReader.open(writer, true); reader = DirectoryReader.open(writer, true);
IndexSearcher searcher = newSearcher(reader); IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(bbb), null, 1000).scoreDocs; ScoreDoc[] hits = searcher.search(new TermQuery(bbb), 1000).scoreDocs;
dir.tweakBufferSizes(); dir.tweakBufferSizes();
assertEquals(36, hits.length); assertEquals(36, hits.length);
@ -248,14 +248,14 @@ public class TestBufferedIndexInput extends LuceneTestCase {
reader = DirectoryReader.open(writer, true); reader = DirectoryReader.open(writer, true);
searcher = newSearcher(reader); searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(bbb), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(bbb), 1000).scoreDocs;
dir.tweakBufferSizes(); dir.tweakBufferSizes();
assertEquals(35, hits.length); assertEquals(35, hits.length);
dir.tweakBufferSizes(); dir.tweakBufferSizes();
hits = searcher.search(new TermQuery(new Term("id", "33")), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(new Term("id", "33")), 1000).scoreDocs;
dir.tweakBufferSizes(); dir.tweakBufferSizes();
assertEquals(1, hits.length); assertEquals(1, hits.length);
hits = searcher.search(new TermQuery(aaa), null, 1000).scoreDocs; hits = searcher.search(new TermQuery(aaa), 1000).scoreDocs;
dir.tweakBufferSizes(); dir.tweakBufferSizes();
assertEquals(35, hits.length); assertEquals(35, hits.length);
writer.close(); writer.close();

2
lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
View File

@ -280,7 +280,7 @@ public class TestLockFactory extends LuceneTestCase {
break; break;
} }
try { try {
searcher.search(query, null, 1000); searcher.search(query, 1000);
} catch (IOException e) { } catch (IOException e) {
hitException = true; hitException = true;
System.out.println("Stress Test Index Searcher: search hit unexpected exception: " + e.toString()); System.out.println("Stress Test Index Searcher: search hit unexpected exception: " + e.toString());

2
lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
View File

@ -120,7 +120,7 @@ public class SearchFiles {
if (repeat > 0) { // repeat & time as benchmark if (repeat > 0) { // repeat & time as benchmark
Date start = new Date(); Date start = new Date();
for (int i = 0; i < repeat; i++) { for (int i = 0; i < repeat; i++) {
searcher.search(query, null, 100); searcher.search(query, 100);
} }
Date end = new Date(); Date end = new Date();
System.out.println("Time: "+(end.getTime()-start.getTime())+"ms"); System.out.println("Time: "+(end.getTime()-start.getTime())+"ms");

2
lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
View File

@ -131,7 +131,7 @@ public class SimpleFacetsExample {
// MatchAllDocsQuery is for "browsing" (counts facets // MatchAllDocsQuery is for "browsing" (counts facets
// for all non-deleted docs in the index); normally // for all non-deleted docs in the index); normally
// you'd use a "normal" query: // you'd use a "normal" query:
searcher.search(new MatchAllDocsQuery(), null /*Filter */, fc); searcher.search(new MatchAllDocsQuery(), fc);
// Retrieve results // Retrieve results
List<FacetResult> results = new ArrayList<>(); List<FacetResult> results = new ArrayList<>();

18
lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
View File

@ -105,7 +105,7 @@ public class TestDemoExpressions extends LuceneTestCase {
// create a sort field and sort by it (reverse order) // create a sort field and sort by it (reverse order)
Sort sort = new Sort(expr.getSortField(bindings, true)); Sort sort = new Sort(expr.getSortField(bindings, true));
Query query = new TermQuery(new Term("body", "contents")); Query query = new TermQuery(new Term("body", "contents"));
searcher.search(query, null, 3, sort); searcher.search(query, 3, sort);
} }
/** tests the returned sort values are correct */ /** tests the returned sort values are correct */
@ -117,7 +117,7 @@ public class TestDemoExpressions extends LuceneTestCase {
Sort sort = new Sort(expr.getSortField(bindings, true)); Sort sort = new Sort(expr.getSortField(bindings, true));
Query query = new TermQuery(new Term("body", "contents")); Query query = new TermQuery(new Term("body", "contents"));
TopFieldDocs td = searcher.search(query, null, 3, sort, true, true); TopFieldDocs td = searcher.search(query, 3, sort, true, true);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
FieldDoc d = (FieldDoc) td.scoreDocs[i]; FieldDoc d = (FieldDoc) td.scoreDocs[i];
float expected = (float) Math.sqrt(d.score); float expected = (float) Math.sqrt(d.score);
@ -135,7 +135,7 @@ public class TestDemoExpressions extends LuceneTestCase {
Sort sort = new Sort(expr.getSortField(bindings, true)); Sort sort = new Sort(expr.getSortField(bindings, true));
Query query = new TermQuery(new Term("body", "contents")); Query query = new TermQuery(new Term("body", "contents"));
TopFieldDocs td = searcher.search(query, null, 3, sort, true, true); TopFieldDocs td = searcher.search(query, 3, sort, true, true);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
FieldDoc d = (FieldDoc) td.scoreDocs[i]; FieldDoc d = (FieldDoc) td.scoreDocs[i];
float expected = 2*d.score; float expected = 2*d.score;
@ -154,7 +154,7 @@ public class TestDemoExpressions extends LuceneTestCase {
Sort sort = new Sort(expr.getSortField(bindings, true)); Sort sort = new Sort(expr.getSortField(bindings, true));
Query query = new TermQuery(new Term("body", "contents")); Query query = new TermQuery(new Term("body", "contents"));
TopFieldDocs td = searcher.search(query, null, 3, sort, true, true); TopFieldDocs td = searcher.search(query, 3, sort, true, true);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
FieldDoc d = (FieldDoc) td.scoreDocs[i]; FieldDoc d = (FieldDoc) td.scoreDocs[i];
float expected = 2*d.score; float expected = 2*d.score;
@ -174,7 +174,7 @@ public class TestDemoExpressions extends LuceneTestCase {
Sort sort = new Sort(expr2.getSortField(bindings, true)); Sort sort = new Sort(expr2.getSortField(bindings, true));
Query query = new TermQuery(new Term("body", "contents")); Query query = new TermQuery(new Term("body", "contents"));
TopFieldDocs td = searcher.search(query, null, 3, sort, true, true); TopFieldDocs td = searcher.search(query, 3, sort, true, true);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
FieldDoc d = (FieldDoc) td.scoreDocs[i]; FieldDoc d = (FieldDoc) td.scoreDocs[i];
float expected = 2*d.score; float expected = 2*d.score;
@ -206,7 +206,7 @@ public class TestDemoExpressions extends LuceneTestCase {
Expression expr = JavascriptCompiler.compile(sb.toString()); Expression expr = JavascriptCompiler.compile(sb.toString());
Sort sort = new Sort(expr.getSortField(bindings, true)); Sort sort = new Sort(expr.getSortField(bindings, true));
Query query = new TermQuery(new Term("body", "contents")); Query query = new TermQuery(new Term("body", "contents"));
TopFieldDocs td = searcher.search(query, null, 3, sort, true, true); TopFieldDocs td = searcher.search(query, 3, sort, true, true);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
FieldDoc d = (FieldDoc) td.scoreDocs[i]; FieldDoc d = (FieldDoc) td.scoreDocs[i];
float expected = n*d.score; float expected = n*d.score;
@ -221,7 +221,7 @@ public class TestDemoExpressions extends LuceneTestCase {
bindings.add(new SortField("latitude", SortField.Type.DOUBLE)); bindings.add(new SortField("latitude", SortField.Type.DOUBLE));
bindings.add(new SortField("longitude", SortField.Type.DOUBLE)); bindings.add(new SortField("longitude", SortField.Type.DOUBLE));
Sort sort = new Sort(distance.getSortField(bindings, false)); Sort sort = new Sort(distance.getSortField(bindings, false));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), null, 3, sort); TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
FieldDoc d = (FieldDoc) td.scoreDocs[0]; FieldDoc d = (FieldDoc) td.scoreDocs[0];
assertEquals(0.4619D, (Double)d.fields[0], 1E-4); assertEquals(0.4619D, (Double)d.fields[0], 1E-4);
@ -238,7 +238,7 @@ public class TestDemoExpressions extends LuceneTestCase {
SimpleBindings bindings = new SimpleBindings(); SimpleBindings bindings = new SimpleBindings();
bindings.add("doc['popularity'].value", new IntFieldSource("popularity")); bindings.add("doc['popularity'].value", new IntFieldSource("popularity"));
Sort sort = new Sort(popularity.getSortField(bindings, true)); Sort sort = new Sort(popularity.getSortField(bindings, true));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), null, 3, sort); TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
FieldDoc d = (FieldDoc)td.scoreDocs[0]; FieldDoc d = (FieldDoc)td.scoreDocs[0];
assertEquals(20D, (Double)d.fields[0], 1E-4); assertEquals(20D, (Double)d.fields[0], 1E-4);
@ -288,7 +288,7 @@ public class TestDemoExpressions extends LuceneTestCase {
} }
}; };
Sort sort = new Sort(popularity.getSortField(bindings, false)); Sort sort = new Sort(popularity.getSortField(bindings, false));
TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), null, 3, sort); TopFieldDocs td = searcher.search(new MatchAllDocsQuery(), 3, sort);
FieldDoc d = (FieldDoc)td.scoreDocs[0]; FieldDoc d = (FieldDoc)td.scoreDocs[0];
assertEquals(2092D, (Double)d.fields[0], 1E-4); assertEquals(2092D, (Double)d.fields[0], 1E-4);

25
lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
View File

@ -86,23 +86,20 @@ public class TestExpressionSorts extends LuceneTestCase {
public void testQueries() throws Exception { public void testQueries() throws Exception {
int n = atLeast(4); int n = atLeast(4);
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
Filter odd = new QueryWrapperFilter(new TermQuery(new Term("oddeven", "odd"))); assertQuery(new MatchAllDocsQuery());
assertQuery(new MatchAllDocsQuery(), null); assertQuery(new TermQuery(new Term("english", "one")));
assertQuery(new TermQuery(new Term("english", "one")), null);
assertQuery(new MatchAllDocsQuery(), odd);
assertQuery(new TermQuery(new Term("english", "four")), odd);
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD); bq.add(new TermQuery(new Term("english", "one")), BooleanClause.Occur.SHOULD);
bq.add(new TermQuery(new Term("oddeven", "even")), BooleanClause.Occur.SHOULD); bq.add(new TermQuery(new Term("oddeven", "even")), BooleanClause.Occur.SHOULD);
assertQuery(bq, null); assertQuery(bq);
// force in order // force in order
bq.add(new TermQuery(new Term("english", "two")), BooleanClause.Occur.SHOULD); bq.add(new TermQuery(new Term("english", "two")), BooleanClause.Occur.SHOULD);
bq.setMinimumNumberShouldMatch(2); bq.setMinimumNumberShouldMatch(2);
assertQuery(bq, null); assertQuery(bq);
} }
} }
void assertQuery(Query query, Filter filter) throws Exception { void assertQuery(Query query) throws Exception {
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
boolean reversed = random().nextBoolean(); boolean reversed = random().nextBoolean();
SortField fields[] = new SortField[] { SortField fields[] = new SortField[] {
@ -114,13 +111,13 @@ public class TestExpressionSorts extends LuceneTestCase {
}; };
Collections.shuffle(Arrays.asList(fields), random()); Collections.shuffle(Arrays.asList(fields), random());
int numSorts = TestUtil.nextInt(random(), 1, fields.length); int numSorts = TestUtil.nextInt(random(), 1, fields.length);
assertQuery(query, filter, new Sort(Arrays.copyOfRange(fields, 0, numSorts))); assertQuery(query, new Sort(Arrays.copyOfRange(fields, 0, numSorts)));
} }
} }
void assertQuery(Query query, Filter filter, Sort sort) throws Exception { void assertQuery(Query query, Sort sort) throws Exception {
int size = TestUtil.nextInt(random(), 1, searcher.getIndexReader().maxDoc() / 5); int size = TestUtil.nextInt(random(), 1, searcher.getIndexReader().maxDoc() / 5);
TopDocs expected = searcher.search(query, filter, size, sort, random().nextBoolean(), random().nextBoolean()); TopDocs expected = searcher.search(query, size, sort, random().nextBoolean(), random().nextBoolean());
// make our actual sort, mutating original by replacing some of the // make our actual sort, mutating original by replacing some of the
// sortfields with equivalent expressions // sortfields with equivalent expressions
@ -141,12 +138,12 @@ public class TestExpressionSorts extends LuceneTestCase {
} }
Sort mutatedSort = new Sort(mutated); Sort mutatedSort = new Sort(mutated);
TopDocs actual = searcher.search(query, filter, size, mutatedSort, random().nextBoolean(), random().nextBoolean()); TopDocs actual = searcher.search(query, size, mutatedSort, random().nextBoolean(), random().nextBoolean());
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs); CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
if (size < actual.totalHits) { if (size < actual.totalHits) {
expected = searcher.searchAfter(expected.scoreDocs[size-1], query, filter, size, sort); expected = searcher.searchAfter(expected.scoreDocs[size-1], query, size, sort);
actual = searcher.searchAfter(actual.scoreDocs[size-1], query, filter, size, mutatedSort); actual = searcher.searchAfter(actual.scoreDocs[size-1], query, size, mutatedSort);
CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs); CheckHits.checkEqual(query, expected.scoreDocs, actual.scoreDocs);
} }
} }

7
lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
View File

@ -46,6 +46,7 @@ import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
@ -752,7 +753,11 @@ public class TestDrillSideways extends FacetTestCase {
verifyEquals(dimValues, s, expected, actual, scores, doUseDV); verifyEquals(dimValues, s, expected, actual, scores, doUseDV);
// Make sure drill down doesn't change score: // Make sure drill down doesn't change score:
TopDocs ddqHits = s.search(ddq, filter, numDocs); Query q = ddq;
if (filter != null) {
q = new FilteredQuery(q, filter);
}
TopDocs ddqHits = s.search(q, numDocs);
assertEquals(expected.hits.size(), ddqHits.totalHits); assertEquals(expected.hits.size(), ddqHits.totalHits);
for(int i=0;i<expected.hits.size();i++) { for(int i=0;i<expected.hits.size();i++) {
// Score should be IDENTICAL: // Score should be IDENTICAL:

33
lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.java
View File

@ -124,34 +124,19 @@ public class GroupingSearch {
* @return the grouped result as a {@link TopGroups} instance * @return the grouped result as a {@link TopGroups} instance
* @throws IOException If any I/O related errors occur * @throws IOException If any I/O related errors occur
*/ */
public <T> TopGroups<T> search(IndexSearcher searcher, Query query, int groupOffset, int groupLimit) throws IOException {
return search(searcher, null, query, groupOffset, groupLimit);
}
/**
* Executes a grouped search. Both the first pass and second pass are executed on the specified searcher.
*
* @param searcher The {@link org.apache.lucene.search.IndexSearcher} instance to execute the grouped search on.
* @param filter The filter to execute with the grouping
* @param query The query to execute with the grouping
* @param groupOffset The group offset
* @param groupLimit The number of groups to return from the specified group offset
* @return the grouped result as a {@link TopGroups} instance
* @throws IOException If any I/O related errors occur
*/
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public <T> TopGroups<T> search(IndexSearcher searcher, Filter filter, Query query, int groupOffset, int groupLimit) throws IOException { public <T> TopGroups<T> search(IndexSearcher searcher, Query query, int groupOffset, int groupLimit) throws IOException {
if (groupField != null || groupFunction != null) { if (groupField != null || groupFunction != null) {
return groupByFieldOrFunction(searcher, filter, query, groupOffset, groupLimit); return groupByFieldOrFunction(searcher, query, groupOffset, groupLimit);
} else if (groupEndDocs != null) { } else if (groupEndDocs != null) {
return (TopGroups<T>) groupByDocBlock(searcher, filter, query, groupOffset, groupLimit); return (TopGroups<T>) groupByDocBlock(searcher, query, groupOffset, groupLimit);
} else { } else {
throw new IllegalStateException("Either groupField, groupFunction or groupEndDocs must be set."); // This can't happen... throw new IllegalStateException("Either groupField, groupFunction or groupEndDocs must be set."); // This can't happen...
} }
} }
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "rawtypes"})
protected TopGroups groupByFieldOrFunction(IndexSearcher searcher, Filter filter, Query query, int groupOffset, int groupLimit) throws IOException { protected TopGroups groupByFieldOrFunction(IndexSearcher searcher, Query query, int groupOffset, int groupLimit) throws IOException {
int topN = groupOffset + groupLimit; int topN = groupOffset + groupLimit;
final AbstractFirstPassGroupingCollector firstPassCollector; final AbstractFirstPassGroupingCollector firstPassCollector;
final AbstractAllGroupsCollector allGroupsCollector; final AbstractAllGroupsCollector allGroupsCollector;
@ -204,9 +189,9 @@ public class GroupingSearch {
} else { } else {
cachedCollector = CachingCollector.create(firstRound, cacheScores, maxDocsToCache); cachedCollector = CachingCollector.create(firstRound, cacheScores, maxDocsToCache);
} }
searcher.search(query, filter, cachedCollector); searcher.search(query, cachedCollector);
} else { } else {
searcher.search(query, filter, firstRound); searcher.search(query, firstRound);
} }
if (allGroups) { if (allGroups) {
@ -236,7 +221,7 @@ public class GroupingSearch {
if (cachedCollector != null && cachedCollector.isCached()) { if (cachedCollector != null && cachedCollector.isCached()) {
cachedCollector.replay(secondPassCollector); cachedCollector.replay(secondPassCollector);
} else { } else {
searcher.search(query, filter, secondPassCollector); searcher.search(query, secondPassCollector);
} }
if (allGroups) { if (allGroups) {
@ -246,10 +231,10 @@ public class GroupingSearch {
} }
} }
protected TopGroups<?> groupByDocBlock(IndexSearcher searcher, Filter filter, Query query, int groupOffset, int groupLimit) throws IOException { protected TopGroups<?> groupByDocBlock(IndexSearcher searcher, Query query, int groupOffset, int groupLimit) throws IOException {
int topN = groupOffset + groupLimit; int topN = groupOffset + groupLimit;
BlockGroupingCollector c = new BlockGroupingCollector(groupSort, topN, includeScores, groupEndDocs); BlockGroupingCollector c = new BlockGroupingCollector(groupSort, topN, includeScores, groupEndDocs);
searcher.search(query, filter, c); searcher.search(query, c);
int topNInsideGroup = groupDocsOffset + groupDocsLimit; int topNInsideGroup = groupDocsOffset + groupDocsLimit;
return c.getTopGroups(sortWithinGroup, groupOffset, groupDocsOffset, topNInsideGroup, fillSortFields); return c.getTopGroups(sortWithinGroup, groupOffset, groupDocsOffset, topNInsideGroup, fillSortFields);
} }

6
lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
View File

@ -123,7 +123,7 @@ public class GroupingSearchTest extends LuceneTestCase {
Sort groupSort = Sort.RELEVANCE; Sort groupSort = Sort.RELEVANCE;
GroupingSearch groupingSearch = createRandomGroupingSearch(groupField, groupSort, 5, canUseIDV); GroupingSearch groupingSearch = createRandomGroupingSearch(groupField, groupSort, 5, canUseIDV);
TopGroups<?> groups = groupingSearch.search(indexSearcher, null, new TermQuery(new Term("content", "random")), 0, 10); TopGroups<?> groups = groupingSearch.search(indexSearcher, new TermQuery(new Term("content", "random")), 0, 10);
assertEquals(7, groups.totalHitCount); assertEquals(7, groups.totalHitCount);
assertEquals(7, groups.totalGroupedHitCount); assertEquals(7, groups.totalGroupedHitCount);
@ -161,7 +161,7 @@ public class GroupingSearchTest extends LuceneTestCase {
Filter lastDocInBlock = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("groupend", "x")))); Filter lastDocInBlock = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("groupend", "x"))));
groupingSearch = new GroupingSearch(lastDocInBlock); groupingSearch = new GroupingSearch(lastDocInBlock);
groups = groupingSearch.search(indexSearcher, null, new TermQuery(new Term("content", "random")), 0, 10); groups = groupingSearch.search(indexSearcher, new TermQuery(new Term("content", "random")), 0, 10);
assertEquals(7, groups.totalHitCount); assertEquals(7, groups.totalHitCount);
assertEquals(7, groups.totalGroupedHitCount); assertEquals(7, groups.totalGroupedHitCount);
@ -237,7 +237,7 @@ public class GroupingSearchTest extends LuceneTestCase {
GroupingSearch gs = new GroupingSearch("group"); GroupingSearch gs = new GroupingSearch("group");
gs.setAllGroups(true); gs.setAllGroups(true);
TopGroups<?> groups = gs.search(indexSearcher, null, new TermQuery(new Term("group", "foo")), 0, 10); TopGroups<?> groups = gs.search(indexSearcher, new TermQuery(new Term("group", "foo")), 0, 10);
assertEquals(1, groups.totalHitCount); assertEquals(1, groups.totalHitCount);
//assertEquals(1, groups.totalGroupCount.intValue()); //assertEquals(1, groups.totalGroupCount.intValue());
assertEquals(1, groups.totalGroupedHitCount); assertEquals(1, groups.totalGroupedHitCount);

14
lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
View File

@ -1014,7 +1014,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
// it rewrites to ConstantScoreQuery which cannot be highlighted // it rewrites to ConstantScoreQuery which cannot be highlighted
// query = unReWrittenQuery.rewrite(reader); // query = unReWrittenQuery.rewrite(reader);
if (VERBOSE) System.out.println("Searching for: " + query.toString(FIELD_NAME)); if (VERBOSE) System.out.println("Searching for: " + query.toString(FIELD_NAME));
hits = searcher.search(query, null, 1000); hits = searcher.search(query, 1000);
for (int i = 0; i < hits.totalHits; i++) { for (int i = 0; i < hits.totalHits; i++) {
final StoredDocument doc = searcher.doc(hits.scoreDocs[i].doc); final StoredDocument doc = searcher.doc(hits.scoreDocs[i].doc);
@ -1036,7 +1036,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
// try null field // try null field
hits = searcher.search(query, null, 1000); hits = searcher.search(query, 1000);
numHighlights = 0; numHighlights = 0;
@ -1061,7 +1061,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
// try default field // try default field
hits = searcher.search(query, null, 1000); hits = searcher.search(query, 1000);
numHighlights = 0; numHighlights = 0;
@ -1541,7 +1541,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
if (VERBOSE) System.out.println("Searching with primitive query"); if (VERBOSE) System.out.println("Searching with primitive query");
// forget to set this and... // forget to set this and...
// query=query.rewrite(reader); // query=query.rewrite(reader);
TopDocs hits = searcher.search(query, null, 1000); TopDocs hits = searcher.search(query, 1000);
// create an instance of the highlighter with the tags used to surround // create an instance of the highlighter with the tags used to surround
// highlighted text // highlighted text
@ -1913,7 +1913,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
//Scorer scorer = new QueryTermScorer( query, "t_text1" ); //Scorer scorer = new QueryTermScorer( query, "t_text1" );
Highlighter h = new Highlighter( scorer ); Highlighter h = new Highlighter( scorer );
TopDocs hits = searcher.search(query, null, 10); TopDocs hits = searcher.search(query, 10);
for( int i = 0; i < hits.totalHits; i++ ){ for( int i = 0; i < hits.totalHits; i++ ){
StoredDocument doc = searcher.doc( hits.scoreDocs[i].doc ); StoredDocument doc = searcher.doc( hits.scoreDocs[i].doc );
String result = h.getBestFragment( a, "t_text1", doc.get( "t_text1" )); String result = h.getBestFragment( a, "t_text1", doc.get( "t_text1" ));
@ -1944,7 +1944,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
scorer.setUsePayloads(true); scorer.setUsePayloads(true);
Highlighter h = new Highlighter(scorer); Highlighter h = new Highlighter(scorer);
TopDocs hits = searcher.search(query, null, 10); TopDocs hits = searcher.search(query, 10);
assertEquals(1, hits.scoreDocs.length); assertEquals(1, hits.scoreDocs.length);
TokenStream stream = TokenSources.getAnyTokenStream(searcher.getIndexReader(), 0, FIELD_NAME, analyzer); TokenStream stream = TokenSources.getAnyTokenStream(searcher.getIndexReader(), 0, FIELD_NAME, analyzer);
if (random().nextBoolean()) { if (random().nextBoolean()) {
@ -1996,7 +1996,7 @@ public class HighlighterTest extends BaseTokenStreamTestCase implements Formatte
// you must use a rewritten query! // you must use a rewritten query!
query = unReWrittenQuery.rewrite(reader); query = unReWrittenQuery.rewrite(reader);
if (VERBOSE) System.out.println("Searching for: " + query.toString(FIELD_NAME)); if (VERBOSE) System.out.println("Searching for: " + query.toString(FIELD_NAME));
hits = searcher.search(query, null, 1000); hits = searcher.search(query, 1000);
} }
public void assertExpectedHighlightCount(final int maxNumFragmentsRequired, public void assertExpectedHighlightCount(final int maxNumFragmentsRequired,

56
lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java
View File

@ -92,7 +92,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
Query query = new WildcardQuery(new Term("body", "te*")); Query query = new WildcardQuery(new Term("body", "te*"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -103,7 +103,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.SHOULD); bq.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -144,7 +144,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
Query query = new PrefixQuery(new Term("body", "te")); Query query = new PrefixQuery(new Term("body", "te"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -155,7 +155,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(new PrefixQuery(new Term("bogus", "te")), BooleanClause.Occur.SHOULD); bq.add(new PrefixQuery(new Term("bogus", "te")), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -196,7 +196,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
Query query = new RegexpQuery(new Term("body", "te.*")); Query query = new RegexpQuery(new Term("body", "te.*"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -207,7 +207,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(new RegexpQuery(new Term("bogus", "te.*")), BooleanClause.Occur.SHOULD); bq.add(new RegexpQuery(new Term("bogus", "te.*")), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -248,7 +248,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
Query query = new FuzzyQuery(new Term("body", "tets"), 1); Query query = new FuzzyQuery(new Term("body", "tets"), 1);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -257,7 +257,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
// with prefix // with prefix
query = new FuzzyQuery(new Term("body", "tets"), 1, 2); query = new FuzzyQuery(new Term("body", "tets"), 1, 2);
topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", query, searcher, topDocs); snippets = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -268,7 +268,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(new FuzzyQuery(new Term("bogus", "tets"), 1), BooleanClause.Occur.SHOULD); bq.add(new FuzzyQuery(new Term("bogus", "tets"), 1), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -309,7 +309,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
Query query = TermRangeQuery.newStringRange("body", "ta", "tf", true, true); Query query = TermRangeQuery.newStringRange("body", "ta", "tf", true, true);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -318,7 +318,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
// null start // null start
query = TermRangeQuery.newStringRange("body", null, "tf", true, true); query = TermRangeQuery.newStringRange("body", null, "tf", true, true);
topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", query, searcher, topDocs); snippets = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -327,7 +327,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
// null end // null end
query = TermRangeQuery.newStringRange("body", "ta", null, true, true); query = TermRangeQuery.newStringRange("body", "ta", null, true, true);
topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", query, searcher, topDocs); snippets = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -336,7 +336,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
// exact start inclusive // exact start inclusive
query = TermRangeQuery.newStringRange("body", "test", "tf", true, true); query = TermRangeQuery.newStringRange("body", "test", "tf", true, true);
topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", query, searcher, topDocs); snippets = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -345,7 +345,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
// exact end inclusive // exact end inclusive
query = TermRangeQuery.newStringRange("body", "ta", "test", true, true); query = TermRangeQuery.newStringRange("body", "ta", "test", true, true);
topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", query, searcher, topDocs); snippets = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -356,7 +356,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
BooleanQuery bq = new BooleanQuery(); BooleanQuery bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(TermRangeQuery.newStringRange("body", "test", "tf", false, true), BooleanClause.Occur.SHOULD); bq.add(TermRangeQuery.newStringRange("body", "test", "tf", false, true), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -367,7 +367,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
bq = new BooleanQuery(); bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(TermRangeQuery.newStringRange("body", "ta", "test", true, false), BooleanClause.Occur.SHOULD); bq.add(TermRangeQuery.newStringRange("body", "ta", "test", true, false), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -378,7 +378,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
bq = new BooleanQuery(); bq = new BooleanQuery();
bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); bq.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
bq.add(TermRangeQuery.newStringRange("bogus", "ta", "tf", true, true), BooleanClause.Occur.SHOULD); bq.add(TermRangeQuery.newStringRange("bogus", "ta", "tf", true, true), BooleanClause.Occur.SHOULD);
topDocs = searcher.search(bq, null, 10, Sort.INDEXORDER); topDocs = searcher.search(bq, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", bq, searcher, topDocs); snippets = highlighter.highlight("body", bq, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -420,7 +420,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
}; };
BooleanQuery query = new BooleanQuery(); BooleanQuery query = new BooleanQuery();
query.add(new WildcardQuery(new Term("body", "te*")), BooleanClause.Occur.SHOULD); query.add(new WildcardQuery(new Term("body", "te*")), BooleanClause.Occur.SHOULD);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -431,7 +431,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
query = new BooleanQuery(); query = new BooleanQuery();
query.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD); query.add(new MatchAllDocsQuery(), BooleanClause.Occur.SHOULD);
query.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.MUST_NOT); query.add(new WildcardQuery(new Term("bogus", "te*")), BooleanClause.Occur.MUST_NOT);
topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
snippets = highlighter.highlight("body", query, searcher, topDocs); snippets = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -474,7 +474,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
FilteredQuery query = new FilteredQuery( FilteredQuery query = new FilteredQuery(
new WildcardQuery(new Term("body", "te*")), new WildcardQuery(new Term("body", "te*")),
new QueryWrapperFilter(new TermQuery(new Term("body", "test")))); new QueryWrapperFilter(new TermQuery(new Term("body", "test"))));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -515,7 +515,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
ConstantScoreQuery query = new ConstantScoreQuery(new WildcardQuery(new Term("body", "te*"))); ConstantScoreQuery query = new ConstantScoreQuery(new WildcardQuery(new Term("body", "te*")));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -557,7 +557,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
}; };
DisjunctionMaxQuery query = new DisjunctionMaxQuery(0); DisjunctionMaxQuery query = new DisjunctionMaxQuery(0);
query.add(new WildcardQuery(new Term("body", "te*"))); query.add(new WildcardQuery(new Term("body", "te*")));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -598,7 +598,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
} }
}; };
Query query = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*"))); Query query = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -640,7 +640,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
}; };
SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*"))); SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanOrQuery(new SpanQuery[] { childQuery }); Query query = new SpanOrQuery(new SpanQuery[] { childQuery });
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -682,7 +682,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
}; };
SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*"))); SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanNearQuery(new SpanQuery[] { childQuery }, 0, true); Query query = new SpanNearQuery(new SpanQuery[] { childQuery }, 0, true);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -725,7 +725,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
SpanQuery include = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*"))); SpanQuery include = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
SpanQuery exclude = new SpanTermQuery(new Term("body", "bogus")); SpanQuery exclude = new SpanTermQuery(new Term("body", "bogus"));
Query query = new SpanNotQuery(include, exclude); Query query = new SpanNotQuery(include, exclude);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -767,7 +767,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
}; };
SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*"))); SpanQuery childQuery = new SpanMultiTermQueryWrapper<>(new WildcardQuery(new Term("body", "te*")));
Query query = new SpanFirstQuery(childQuery, 1000000); Query query = new SpanFirstQuery(childQuery, 1000000);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -811,7 +811,7 @@ public class TestMultiTermHighlighting extends LuceneTestCase {
query.add(new WildcardQuery(new Term("body", "te*")), BooleanClause.Occur.SHOULD); query.add(new WildcardQuery(new Term("body", "te*")), BooleanClause.Occur.SHOULD);
query.add(new WildcardQuery(new Term("body", "one")), BooleanClause.Occur.SHOULD); query.add(new WildcardQuery(new Term("body", "one")), BooleanClause.Occur.SHOULD);
query.add(new WildcardQuery(new Term("body", "se*")), BooleanClause.Occur.SHOULD); query.add(new WildcardQuery(new Term("body", "se*")), BooleanClause.Occur.SHOULD);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);

32
lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java
View File

@ -76,7 +76,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "highlighting")); Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -145,7 +145,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
PostingsHighlighter highlighter = new PostingsHighlighter(maxLength); PostingsHighlighter highlighter = new PostingsHighlighter(maxLength);
@ -179,7 +179,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -214,7 +214,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -251,7 +251,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(40); PostingsHighlighter highlighter = new PostingsHighlighter(40);
Query query = new TermQuery(new Term("body", "field")); Query query = new TermQuery(new Term("body", "field"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -291,7 +291,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
BooleanQuery query = new BooleanQuery(); BooleanQuery query = new BooleanQuery();
query.add(new TermQuery(new Term("body", "highlighting")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("body", "highlighting")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("title", "best")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("title", "best")), BooleanClause.Occur.SHOULD);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
Map<String,String[]> snippets = highlighter.highlightFields(new String [] { "body", "title" }, query, searcher, topDocs); Map<String,String[]> snippets = highlighter.highlightFields(new String [] { "body", "title" }, query, searcher, topDocs);
assertEquals(2, snippets.size()); assertEquals(2, snippets.size());
@ -329,7 +329,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
query.add(new TermQuery(new Term("body", "highlighting")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("body", "highlighting")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("body", "just")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("body", "just")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("body", "first")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("body", "first")), BooleanClause.Occur.SHOULD);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -363,7 +363,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2); String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2);
assertEquals(2, snippets.length); assertEquals(2, snippets.length);
@ -401,7 +401,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
try { try {
highlighter.highlight("body", query, searcher, topDocs, 2); highlighter.highlight("body", query, searcher, topDocs, 2);
@ -539,7 +539,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2); String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -603,7 +603,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
} }
}; };
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2); String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -636,7 +636,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
IndexSearcher searcher = newSearcher(ir); IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(); PostingsHighlighter highlighter = new PostingsHighlighter();
Query query = new TermQuery(new Term("body", "highlighting")); Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(2, topDocs.totalHits); assertEquals(2, topDocs.totalHits);
ScoreDoc[] hits = topDocs.scoreDocs; ScoreDoc[] hits = topDocs.scoreDocs;
int[] docIDs = new int[2]; int[] docIDs = new int[2];
@ -688,7 +688,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
}; };
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2); String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 2);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -1015,7 +1015,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
} }
}; };
Query query = new TermQuery(new Term("body", "highlighting")); Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -1059,7 +1059,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
} }
}; };
Query query = new TermQuery(new Term("body", "field")); Query query = new TermQuery(new Term("body", "field"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs); String snippets[] = highlighter.highlight("body", query, searcher, topDocs);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -1106,7 +1106,7 @@ public class TestPostingsHighlighter extends LuceneTestCase {
}; };
Query query = new TermQuery(new Term("body", "highlighting")); Query query = new TermQuery(new Term("body", "highlighting"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
int[] docIDs = new int[1]; int[] docIDs = new int[1];
docIDs[0] = topDocs.scoreDocs[0].doc; docIDs[0] = topDocs.scoreDocs[0].doc;

4
lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java
View File

@ -272,7 +272,7 @@ public class TestPostingsHighlighterRanking extends LuceneTestCase {
} }
}; };
Query query = new TermQuery(new Term("body", "test")); Query query = new TermQuery(new Term("body", "test"));
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 1); String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 1);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);
@ -313,7 +313,7 @@ public class TestPostingsHighlighterRanking extends LuceneTestCase {
BooleanQuery query = new BooleanQuery(); BooleanQuery query = new BooleanQuery();
query.add(new TermQuery(new Term("body", "foo")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("body", "foo")), BooleanClause.Occur.SHOULD);
query.add(new TermQuery(new Term("body", "bar")), BooleanClause.Occur.SHOULD); query.add(new TermQuery(new Term("body", "bar")), BooleanClause.Occur.SHOULD);
TopDocs topDocs = searcher.search(query, null, 10, Sort.INDEXORDER); TopDocs topDocs = searcher.search(query, 10, Sort.INDEXORDER);
assertEquals(1, topDocs.totalHits); assertEquals(1, topDocs.totalHits);
String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 1); String snippets[] = highlighter.highlight("body", query, searcher, topDocs, 1);
assertEquals(1, snippets.length); assertEquals(1, snippets.length);

57
lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
View File

@ -51,6 +51,7 @@ import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Explanation; import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.MultiTermQuery;
@ -246,8 +247,8 @@ public class TestBlockJoin extends LuceneTestCase {
assertEquals("Lisa", getParentDoc(r, parentsFilter, hits.scoreDocs[0].doc).get("name")); assertEquals("Lisa", getParentDoc(r, parentsFilter, hits.scoreDocs[0].doc).get("name"));
// Test with filter on child docs: // Test with filter on child docs:
assertEquals(0, s.search(fullChildQuery, assertEquals(0, s.search(new FilteredQuery(fullChildQuery,
new QueryWrapperFilter(new TermQuery(new Term("skill", "foosball"))), new QueryWrapperFilter(new TermQuery(new Term("skill", "foosball")))),
1).totalHits); 1).totalHits);
r.close(); r.close();
@ -354,20 +355,20 @@ public class TestBlockJoin extends LuceneTestCase {
assertEquals("no filter - both passed", 2, s.search(childJoinQuery, 10).totalHits); assertEquals("no filter - both passed", 2, s.search(childJoinQuery, 10).totalHits);
assertEquals("dummy filter passes everyone ", 2, s.search(childJoinQuery, parentsFilter, 10).totalHits); assertEquals("dummy filter passes everyone ", 2, s.search(new FilteredQuery(childJoinQuery, parentsFilter), 10).totalHits);
assertEquals("dummy filter passes everyone ", 2, s.search(childJoinQuery, new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))), 10).totalHits); assertEquals("dummy filter passes everyone ", 2, s.search(new FilteredQuery(childJoinQuery, new QueryWrapperFilter(new TermQuery(new Term("docType", "resume")))), 10).totalHits);
// not found test // not found test
assertEquals("noone live there", 0, s.search(childJoinQuery, new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("country", "Oz")))), 1).totalHits); assertEquals("noone live there", 0, s.search(new FilteredQuery(childJoinQuery, new BitDocIdSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("country", "Oz"))))), 1).totalHits);
assertEquals("noone live there", 0, s.search(childJoinQuery, new QueryWrapperFilter(new TermQuery(new Term("country", "Oz"))), 1).totalHits); assertEquals("noone live there", 0, s.search(new FilteredQuery(childJoinQuery, new QueryWrapperFilter(new TermQuery(new Term("country", "Oz")))), 1).totalHits);
// apply the UK filter by the searcher // apply the UK filter by the searcher
TopDocs ukOnly = s.search(childJoinQuery, new QueryWrapperFilter(parentQuery), 1); TopDocs ukOnly = s.search(new FilteredQuery(childJoinQuery, new QueryWrapperFilter(parentQuery)), 1);
assertEquals("has filter - single passed", 1, ukOnly.totalHits); assertEquals("has filter - single passed", 1, ukOnly.totalHits);
assertEquals( "Lisa", r.document(ukOnly.scoreDocs[0].doc).get("name")); assertEquals( "Lisa", r.document(ukOnly.scoreDocs[0].doc).get("name"));
// looking for US candidates // looking for US candidates
TopDocs usThen = s.search(childJoinQuery , new QueryWrapperFilter(new TermQuery(new Term("country", "United States"))), 1); TopDocs usThen = s.search(new FilteredQuery(childJoinQuery , new QueryWrapperFilter(new TermQuery(new Term("country", "United States")))), 1);
assertEquals("has filter - single passed", 1, usThen.totalHits); assertEquals("has filter - single passed", 1, usThen.totalHits);
assertEquals("Frank", r.document(usThen.scoreDocs[0].doc).get("name")); assertEquals("Frank", r.document(usThen.scoreDocs[0].doc).get("name"));
@ -377,14 +378,14 @@ public class TestBlockJoin extends LuceneTestCase {
s.search(new ToChildBlockJoinQuery(us, s.search(new ToChildBlockJoinQuery(us,
parentsFilter), 10).totalHits ); parentsFilter), 10).totalHits );
assertEquals("java skills in US", 1, s.search(new ToChildBlockJoinQuery(us, parentsFilter), assertEquals("java skills in US", 1, s.search(new FilteredQuery(new ToChildBlockJoinQuery(us, parentsFilter),
skill("java"), 10).totalHits ); skill("java")), 10).totalHits );
BooleanQuery rubyPython = new BooleanQuery(); BooleanQuery rubyPython = new BooleanQuery();
rubyPython.add(new TermQuery(new Term("skill", "ruby")), Occur.SHOULD); rubyPython.add(new TermQuery(new Term("skill", "ruby")), Occur.SHOULD);
rubyPython.add(new TermQuery(new Term("skill", "python")), Occur.SHOULD); rubyPython.add(new TermQuery(new Term("skill", "python")), Occur.SHOULD);
assertEquals("ruby skills in US", 1, s.search(new ToChildBlockJoinQuery(us, parentsFilter), assertEquals("ruby skills in US", 1, s.search(new FilteredQuery(new ToChildBlockJoinQuery(us, parentsFilter),
new QueryWrapperFilter(rubyPython), 10).totalHits ); new QueryWrapperFilter(rubyPython)), 10).totalHits );
r.close(); r.close();
dir.close(); dir.close();
@ -786,7 +787,7 @@ public class TestBlockJoin extends LuceneTestCase {
sortFields.addAll(Arrays.asList(childSort.getSort())); sortFields.addAll(Arrays.asList(childSort.getSort()));
final Sort parentAndChildSort = new Sort(sortFields.toArray(new SortField[sortFields.size()])); final Sort parentAndChildSort = new Sort(sortFields.toArray(new SortField[sortFields.size()]));
final TopDocs results = s.search(parentQuery, null, r.numDocs(), final TopDocs results = s.search(parentQuery, r.numDocs(),
parentAndChildSort); parentAndChildSort);
if (VERBOSE) { if (VERBOSE) {
@ -922,30 +923,24 @@ public class TestBlockJoin extends LuceneTestCase {
final ToChildBlockJoinQuery parentJoinQuery2 = new ToChildBlockJoinQuery(parentQuery2, parentsFilter); final ToChildBlockJoinQuery parentJoinQuery2 = new ToChildBlockJoinQuery(parentQuery2, parentsFilter);
// To run against the block-join index: // To run against the block-join index:
final Query childJoinQuery2; Query childJoinQuery2;
// Same query as parentJoinQuery, but to run against // Same query as parentJoinQuery, but to run against
// the fully denormalized index (so we can compare // the fully denormalized index (so we can compare
// results): // results):
final Query childQuery2; Query childQuery2;
// apply a filter to children
final Filter childFilter2, childJoinFilter2;
if (random().nextBoolean()) { if (random().nextBoolean()) {
childQuery2 = parentQuery2; childQuery2 = parentQuery2;
childJoinQuery2 = parentJoinQuery2; childJoinQuery2 = parentJoinQuery2;
childFilter2 = null;
childJoinFilter2 = null;
} else { } else {
final Term childTerm = randomChildTerm(childFields[0]); final Term childTerm = randomChildTerm(childFields[0]);
if (random().nextBoolean()) { // filtered case if (random().nextBoolean()) { // filtered case
childJoinQuery2 = parentJoinQuery2; childJoinQuery2 = parentJoinQuery2;
final Filter f = new QueryWrapperFilter(new TermQuery(childTerm)); final Filter f = new QueryWrapperFilter(new TermQuery(childTerm));
childJoinFilter2 = random().nextBoolean() childJoinQuery2 = new FilteredQuery(childJoinQuery2, random().nextBoolean()
? new BitDocIdSetCachingWrapperFilter(f): f; ? new BitDocIdSetCachingWrapperFilter(f): f);
} else { } else {
childJoinFilter2 = null;
// AND child field w/ parent query: // AND child field w/ parent query:
final BooleanQuery bq = new BooleanQuery(); final BooleanQuery bq = new BooleanQuery();
childJoinQuery2 = bq; childJoinQuery2 = bq;
@ -963,10 +958,9 @@ public class TestBlockJoin extends LuceneTestCase {
if (random().nextBoolean()) { // filtered case if (random().nextBoolean()) { // filtered case
childQuery2 = parentQuery2; childQuery2 = parentQuery2;
final Filter f = new QueryWrapperFilter(new TermQuery(childTerm)); final Filter f = new QueryWrapperFilter(new TermQuery(childTerm));
childFilter2 = random().nextBoolean() childQuery2 = new FilteredQuery(childQuery2, random().nextBoolean()
? new BitDocIdSetCachingWrapperFilter(f): f; ? new BitDocIdSetCachingWrapperFilter(f): f);
} else { } else {
childFilter2 = null;
final BooleanQuery bq2 = new BooleanQuery(); final BooleanQuery bq2 = new BooleanQuery();
childQuery2 = bq2; childQuery2 = bq2;
if (random().nextBoolean()) { if (random().nextBoolean()) {
@ -985,11 +979,9 @@ public class TestBlockJoin extends LuceneTestCase {
// Search denormalized index: // Search denormalized index:
if (VERBOSE) { if (VERBOSE) {
System.out.println("TEST: run top down query=" + childQuery2 + System.out.println("TEST: run top down query=" + childQuery2 + " sort=" + childSort2);
" filter=" + childFilter2 +
" sort=" + childSort2);
} }
final TopDocs results2 = s.search(childQuery2, childFilter2, r.numDocs(), final TopDocs results2 = s.search(childQuery2, r.numDocs(),
childSort2); childSort2);
if (VERBOSE) { if (VERBOSE) {
System.out.println(" " + results2.totalHits + " totalHits:"); System.out.println(" " + results2.totalHits + " totalHits:");
@ -1001,10 +993,9 @@ public class TestBlockJoin extends LuceneTestCase {
// Search join index: // Search join index:
if (VERBOSE) { if (VERBOSE) {
System.out.println("TEST: run top down join query=" + childJoinQuery2 + System.out.println("TEST: run top down join query=" + childJoinQuery2 + " sort=" + childSort2);
" filter=" + childJoinFilter2 + " sort=" + childSort2);
} }
TopDocs joinResults2 = joinS.search(childJoinQuery2, childJoinFilter2, joinR.numDocs(), childSort2); TopDocs joinResults2 = joinS.search(childJoinQuery2, joinR.numDocs(), childSort2);
if (VERBOSE) { if (VERBOSE) {
System.out.println(" " + joinResults2.totalHits + " totalHits:"); System.out.println(" " + joinResults2.totalHits + " totalHits:");
for(ScoreDoc sd : joinResults2.scoreDocs) { for(ScoreDoc sd : joinResults2.scoreDocs) {

3
lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
View File

@ -31,6 +31,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter; import org.apache.lucene.search.QueryWrapperFilter;
@ -121,7 +122,7 @@ public class TestBlockJoinValidation extends LuceneTestCase {
Filter childFilter = new QueryWrapperFilter(new TermQuery(new Term("common_field", "1"))); Filter childFilter = new QueryWrapperFilter(new TermQuery(new Term("common_field", "1")));
thrown.expect(IllegalStateException.class); thrown.expect(IllegalStateException.class);
thrown.expectMessage(ToChildBlockJoinQuery.ILLEGAL_ADVANCE_ON_PARENT); thrown.expectMessage(ToChildBlockJoinQuery.ILLEGAL_ADVANCE_ON_PARENT);
indexSearcher.search(blockJoinQuery, childFilter, 1); indexSearcher.search(new FilteredQuery(blockJoinQuery, childFilter), 1);
} }
@Test @Test

26
lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java
View File

@ -1006,7 +1006,7 @@ public class TestFieldCacheSort extends LuceneTestCase {
Collections.singletonMap("f", Type.SORTED)); Collections.singletonMap("f", Type.SORTED));
w.close(); w.close();
IndexSearcher s = newSearcher(r); IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new TermQuery(new Term("t", "1")), null, 10, new Sort(new SortField("f", SortField.Type.STRING))); TopDocs hits = s.search(new TermQuery(new Term("t", "1")), 10, new Sort(new SortField("f", SortField.Type.STRING)));
assertEquals(2, hits.totalHits); assertEquals(2, hits.totalHits);
// null sorts first // null sorts first
assertEquals(1, hits.scoreDocs[0].doc); assertEquals(1, hits.scoreDocs[0].doc);
@ -1035,7 +1035,7 @@ public class TestFieldCacheSort extends LuceneTestCase {
Collections.singletonMap("string", Type.SORTED)); Collections.singletonMap("string", Type.SORTED));
IndexSearcher searcher = new IndexSearcher(reader); IndexSearcher searcher = new IndexSearcher(reader);
try { try {
searcher.search(new MatchAllDocsQuery(), null, 500, sort); searcher.search(new MatchAllDocsQuery(), 500, sort);
fail("didn't get expected exception"); fail("didn't get expected exception");
} catch (IllegalStateException expected) {} } catch (IllegalStateException expected) {}
reader.close(); reader.close();
@ -1069,10 +1069,10 @@ public class TestFieldCacheSort extends LuceneTestCase {
Query q = new TermQuery(new Term("body", "text")); Query q = new TermQuery(new Term("body", "text"));
IndexSearcher s = newSearcher(r); IndexSearcher s = newSearcher(r);
float maxScore = s.search(q , 10).getMaxScore(); float maxScore = s.search(q , 10).getMaxScore();
assertEquals(maxScore, s.search(q, null, 3, Sort.INDEXORDER, random().nextBoolean(), true).getMaxScore(), 0.0); assertEquals(maxScore, s.search(q, 3, Sort.INDEXORDER, random().nextBoolean(), true).getMaxScore(), 0.0);
assertEquals(maxScore, s.search(q, null, 3, Sort.RELEVANCE, random().nextBoolean(), true).getMaxScore(), 0.0); assertEquals(maxScore, s.search(q, 3, Sort.RELEVANCE, random().nextBoolean(), true).getMaxScore(), 0.0);
assertEquals(maxScore, s.search(q, null, 3, new Sort(new SortField[] {new SortField("id", SortField.Type.INT, false)}), random().nextBoolean(), true).getMaxScore(), 0.0); assertEquals(maxScore, s.search(q, 3, new Sort(new SortField[] {new SortField("id", SortField.Type.INT, false)}), random().nextBoolean(), true).getMaxScore(), 0.0);
assertEquals(maxScore, s.search(q, null, 3, new Sort(new SortField[] {new SortField("id", SortField.Type.INT, true)}), random().nextBoolean(), true).getMaxScore(), 0.0); assertEquals(maxScore, s.search(q, 3, new Sort(new SortField[] {new SortField("id", SortField.Type.INT, true)}), random().nextBoolean(), true).getMaxScore(), 0.0);
TestUtil.checkReader(r); TestUtil.checkReader(r);
r.close(); r.close();
d.close(); d.close();
@ -1084,27 +1084,27 @@ public class TestFieldCacheSort extends LuceneTestCase {
Query query = new TermQuery(new Term("contents", "foo")); Query query = new TermQuery(new Term("contents", "foo"));
Sort sort = new Sort(); Sort sort = new Sort();
TopDocs td = empty.search(query, null, 10, sort, true, true); TopDocs td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
sort.setSort(SortField.FIELD_DOC); sort.setSort(SortField.FIELD_DOC);
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
sort.setSort(new SortField("int", SortField.Type.INT), SortField.FIELD_DOC); sort.setSort(new SortField("int", SortField.Type.INT), SortField.FIELD_DOC);
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
sort.setSort(new SortField("string", SortField.Type.STRING, true), SortField.FIELD_DOC); sort.setSort(new SortField("string", SortField.Type.STRING, true), SortField.FIELD_DOC);
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
sort.setSort(new SortField("string_val", SortField.Type.STRING_VAL, true), SortField.FIELD_DOC); sort.setSort(new SortField("string_val", SortField.Type.STRING_VAL, true), SortField.FIELD_DOC);
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
sort.setSort(new SortField("float", SortField.Type.FLOAT), new SortField("string", SortField.Type.STRING)); sort.setSort(new SortField("float", SortField.Type.FLOAT), new SortField("string", SortField.Type.STRING));
td = empty.search(query, null, 10, sort, true, true); td = empty.search(query, 10, sort, true, true);
assertEquals(0, td.totalHits); assertEquals(0, td.totalHits);
} }
@ -1146,7 +1146,7 @@ public class TestFieldCacheSort extends LuceneTestCase {
TopDocs expected = searcher.search(new TermQuery(new Term("value", "foo")), 10); TopDocs expected = searcher.search(new TermQuery(new Term("value", "foo")), 10);
assertEquals(1, expected.totalHits); assertEquals(1, expected.totalHits);
TopDocs actual = searcher.search(new TermQuery(new Term("value", "foo")), null, 10, sort, true, true); TopDocs actual = searcher.search(new TermQuery(new Term("value", "foo")), 10, sort, true, true);
assertEquals(expected.totalHits, actual.totalHits); assertEquals(expected.totalHits, actual.totalHits);
assertEquals(expected.scoreDocs[0].score, actual.scoreDocs[0].score, 0F); assertEquals(expected.scoreDocs[0].score, actual.scoreDocs[0].score, 0F);

9
lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
View File

@ -43,6 +43,7 @@ import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Sort; import org.apache.lucene.search.Sort;
@ -173,13 +174,13 @@ public class TestFieldCacheSortRandom extends LuceneTestCase {
// Set minNrShouldMatch to 1 so that BQ will not optimize rewrite to return // Set minNrShouldMatch to 1 so that BQ will not optimize rewrite to return
// the clause instead of BQ. // the clause instead of BQ.
bq.setMinimumNumberShouldMatch(1); bq.setMinimumNumberShouldMatch(1);
hits = s.search(bq, f, hitCount, sort, random.nextBoolean(), random.nextBoolean()); hits = s.search(new FilteredQuery(bq, f), hitCount, sort, random.nextBoolean(), random.nextBoolean());
} else if (queryType == 1) { } else if (queryType == 1) {
hits = s.search(new ConstantScoreQuery(f), hits = s.search(new ConstantScoreQuery(f),
null, hitCount, sort, random.nextBoolean(), random.nextBoolean()); hitCount, sort, random.nextBoolean(), random.nextBoolean());
} else { } else {
hits = s.search(new MatchAllDocsQuery(), hits = s.search(new FilteredQuery(new MatchAllDocsQuery(),
f, hitCount, sort, random.nextBoolean(), random.nextBoolean()); f), hitCount, sort, random.nextBoolean(), random.nextBoolean());
} }
if (VERBOSE) { if (VERBOSE) {

2
lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java
View File

@ -127,7 +127,7 @@ public class TestNumericTerms32 extends LuceneTestCase {
int a=lower; lower=upper; upper=a; int a=lower; lower=upper; upper=a;
} }
Query tq=NumericRangeQuery.newIntRange(field, precisionStep, lower, upper, true, true); Query tq=NumericRangeQuery.newIntRange(field, precisionStep, lower, upper, true, true);
TopDocs topDocs = searcher.search(tq, null, noDocs, new Sort(new SortField(field, SortField.Type.INT, true))); TopDocs topDocs = searcher.search(tq, noDocs, new Sort(new SortField(field, SortField.Type.INT, true)));
if (topDocs.totalHits==0) continue; if (topDocs.totalHits==0) continue;
ScoreDoc[] sd = topDocs.scoreDocs; ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);

2
lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java
View File

@ -132,7 +132,7 @@ public class TestNumericTerms64 extends LuceneTestCase {
long a=lower; lower=upper; upper=a; long a=lower; lower=upper; upper=a;
} }
Query tq=NumericRangeQuery.newLongRange(field, precisionStep, lower, upper, true, true); Query tq=NumericRangeQuery.newLongRange(field, precisionStep, lower, upper, true, true);
TopDocs topDocs = searcher.search(tq, null, noDocs, new Sort(new SortField(field, SortField.Type.LONG, true))); TopDocs topDocs = searcher.search(tq, noDocs, new Sort(new SortField(field, SortField.Type.LONG, true)));
if (topDocs.totalHits==0) continue; if (topDocs.totalHits==0) continue;
ScoreDoc[] sd = topDocs.scoreDocs; ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd); assertNotNull(sd);

10
lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
View File

@ -263,11 +263,11 @@ public class TestCustomScoreQuery extends FunctionTestSetup {
log(q5CustomMulAdd); log(q5CustomMulAdd);
// do al the searches // do al the searches
TopDocs td1 = s.search(q1, null, 1000); TopDocs td1 = s.search(q1, 1000);
TopDocs td2CustomNeutral = s.search(q2CustomNeutral, null, 1000); TopDocs td2CustomNeutral = s.search(q2CustomNeutral, 1000);
TopDocs td3CustomMul = s.search(q3CustomMul, null, 1000); TopDocs td3CustomMul = s.search(q3CustomMul, 1000);
TopDocs td4CustomAdd = s.search(q4CustomAdd, null, 1000); TopDocs td4CustomAdd = s.search(q4CustomAdd, 1000);
TopDocs td5CustomMulAdd = s.search(q5CustomMulAdd, null, 1000); TopDocs td5CustomMulAdd = s.search(q5CustomMulAdd, 1000);
// put results in map so we can verify the scores although they have changed // put results in map so we can verify the scores although they have changed
Map<Integer,Float> h1 = topDocsToMap(td1); Map<Integer,Float> h1 = topDocsToMap(td1);

4
lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
View File

@ -64,7 +64,7 @@ public class TestFieldScoreQuery extends FunctionTestSetup {
IndexSearcher s = newSearcher(r); IndexSearcher s = newSearcher(r);
log("test: "+ functionQuery); log("test: "+ functionQuery);
QueryUtils.check(random(), functionQuery,s); QueryUtils.check(random(), functionQuery,s);
ScoreDoc[] h = s.search(functionQuery, null, 1000).scoreDocs; ScoreDoc[] h = s.search(functionQuery, 1000).scoreDocs;
assertEquals("All docs should be matched!",N_DOCS,h.length); assertEquals("All docs should be matched!",N_DOCS,h.length);
String prevID = "ID"+(N_DOCS+1); // greater than all ids of docs in this test String prevID = "ID"+(N_DOCS+1); // greater than all ids of docs in this test
for (int i=0; i<h.length; i++) { for (int i=0; i<h.length; i++) {
@ -95,7 +95,7 @@ public class TestFieldScoreQuery extends FunctionTestSetup {
FunctionQuery functionQuery = new FunctionQuery(valueSource); FunctionQuery functionQuery = new FunctionQuery(valueSource);
IndexReader r = DirectoryReader.open(dir); IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = newSearcher(r); IndexSearcher s = newSearcher(r);
TopDocs td = s.search(functionQuery,null,1000); TopDocs td = s.search(functionQuery,1000);
assertEquals("All docs should be matched!",N_DOCS,td.totalHits); assertEquals("All docs should be matched!",N_DOCS,td.totalHits);
ScoreDoc sd[] = td.scoreDocs; ScoreDoc sd[] = td.scoreDocs;
for (ScoreDoc aSd : sd) { for (ScoreDoc aSd : sd) {

2
lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
View File

@ -569,7 +569,7 @@ public class TestValueSources extends LuceneTestCase {
expectedDocs[i] = i; expectedDocs[i] = i;
expected[i] = new ScoreDoc(i, scores[i]); expected[i] = new ScoreDoc(i, scores[i]);
} }
TopDocs docs = searcher.search(q, null, documents.size(), TopDocs docs = searcher.search(q, documents.size(),
new Sort(new SortField("id", SortField.Type.STRING)), true, false); new Sort(new SortField("id", SortField.Type.STRING)), true, false);
CheckHits.checkHits(random(), q, "", searcher, expectedDocs); CheckHits.checkHits(random(), q, "", searcher, expectedDocs);
CheckHits.checkHitsQuery(q, expected, docs.scoreDocs, expectedDocs); CheckHits.checkHitsQuery(q, expected, docs.scoreDocs, expectedDocs);

2
lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
View File

@ -298,7 +298,7 @@ public class TestMultiFieldQueryParser extends LuceneTestCase {
Query q = mfqp.parse("the footest"); Query q = mfqp.parse("the footest");
IndexReader ir = DirectoryReader.open(ramDir); IndexReader ir = DirectoryReader.open(ramDir);
IndexSearcher is = newSearcher(ir); IndexSearcher is = newSearcher(ir);
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
ir.close(); ir.close();
ramDir.close(); ramDir.close();

2
lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
View File

@ -334,7 +334,7 @@ public class TestMultiFieldQPHelper extends LuceneTestCase {
Query q = mfqp.parse("the footest", null); Query q = mfqp.parse("the footest", null);
IndexReader ir = DirectoryReader.open(ramDir); IndexReader ir = DirectoryReader.open(ramDir);
IndexSearcher is = newSearcher(ir); IndexSearcher is = newSearcher(ir);
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(1, hits.length); assertEquals(1, hits.length);
ir.close(); ir.close();
ramDir.close(); ramDir.close();

2
lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
View File

@ -1257,7 +1257,7 @@ public class TestQPHelper extends LuceneTestCase {
qp.setLocale(Locale.ENGLISH); qp.setLocale(Locale.ENGLISH);
Query q = qp.parse(query, "date"); Query q = qp.parse(query, "date");
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(expected, hits.length); assertEquals(expected, hits.length);
} }

2
lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
View File

@ -1072,7 +1072,7 @@ public abstract class QueryParserTestBase extends LuceneTestCase {
CommonQueryParserConfiguration qp = getParserConfig( new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)); CommonQueryParserConfiguration qp = getParserConfig( new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
qp.setLocale(Locale.ENGLISH); qp.setLocale(Locale.ENGLISH);
Query q = getQuery(query,qp); Query q = getQuery(query,qp);
ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs; ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(expected, hits.length); assertEquals(expected, hits.length);
setDefaultField( oldDefaultField ); setDefaultField( oldDefaultField );
} }

6
lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
View File

@ -133,7 +133,7 @@ public class TestParser extends LuceneTestCase {
public void testCustomFieldUserQueryXML() throws ParserException, IOException { public void testCustomFieldUserQueryXML() throws ParserException, IOException {
Query q = parse("UserInputQueryCustomField.xml"); Query q = parse("UserInputQueryCustomField.xml");
int h = searcher.search(q, null, 1000).totalHits; int h = searcher.search(q, 1000).totalHits;
assertEquals("UserInputQueryCustomField should produce 0 result ", 0, h); assertEquals("UserInputQueryCustomField should produce 0 result ", 0, h);
} }
@ -190,7 +190,7 @@ public class TestParser extends LuceneTestCase {
List<LeafReaderContext> leaves = searcher.getTopReaderContext().leaves(); List<LeafReaderContext> leaves = searcher.getTopReaderContext().leaves();
Assume.assumeTrue(leaves.size() == 1); Assume.assumeTrue(leaves.size() == 1);
Query q = parse("DuplicateFilterQuery.xml"); Query q = parse("DuplicateFilterQuery.xml");
int h = searcher.search(q, null, 1000).totalHits; int h = searcher.search(q, 1000).totalHits;
assertEquals("DuplicateFilterQuery should produce 1 result ", 1, h); assertEquals("DuplicateFilterQuery should produce 1 result ", 1, h);
} }
@ -217,7 +217,7 @@ public class TestParser extends LuceneTestCase {
if (VERBOSE) { if (VERBOSE) {
System.out.println("TEST: query=" + q); System.out.println("TEST: query=" + q);
} }
TopDocs hits = searcher.search(q, null, numDocs); TopDocs hits = searcher.search(q, numDocs);
assertTrue(qType + " should produce results ", hits.totalHits > 0); assertTrue(qType + " should produce results ", hits.totalHits > 0);
if (VERBOSE) { if (VERBOSE) {
System.out.println("=========" + qType + "============"); System.out.println("=========" + qType + "============");

2
lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
View File

@ -98,7 +98,7 @@ public class TestQueryTemplateManager extends LuceneTestCase {
Query q = builder.getQuery(doc.getDocumentElement()); Query q = builder.getQuery(doc.getDocumentElement());
//Run the query //Run the query
int h = searcher.search(q, null, 1000).totalHits; int h = searcher.search(q, 1000).totalHits;
//Check we have the expected number of results //Check we have the expected number of results
int expectedHits = Integer.parseInt(queryFormProperties.getProperty("expectedMatches")); int expectedHits = Integer.parseInt(queryFormProperties.getProperty("expectedMatches"));

Some files were not shown because too many files have changed in this diff Show More