You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2015/02/24 19:50:18 UTC
svn commit: r1662082 [4/5] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/
lucene/backward-codecs/
lucene/backward-codecs/src/test/org/apache/lucene/index/ lucene/benc...
Modified: lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Tue Feb 24 18:50:15 2015
@@ -50,6 +50,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.MultiTermQuery;
@@ -245,8 +246,8 @@ public class TestBlockJoin extends Lucen
assertEquals("Lisa", getParentDoc(r, parentsFilter, hits.scoreDocs[0].doc).get("name"));
// Test with filter on child docs:
- assertEquals(0, s.search(fullChildQuery,
- new QueryWrapperFilter(new TermQuery(new Term("skill", "foosball"))),
+ assertEquals(0, s.search(new FilteredQuery(fullChildQuery,
+ new QueryWrapperFilter(new TermQuery(new Term("skill", "foosball")))),
1).totalHits);
r.close();
@@ -353,20 +354,20 @@ public class TestBlockJoin extends Lucen
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(childJoinQuery, new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))), 10).totalHits);
+ assertEquals("dummy filter passes everyone ", 2, s.search(new FilteredQuery(childJoinQuery, parentsFilter), 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
- 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(childJoinQuery, 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(new FilteredQuery(childJoinQuery, new QueryWrapperFilter(new TermQuery(new Term("country", "Oz")))), 1).totalHits);
// 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( "Lisa", r.document(ukOnly.scoreDocs[0].doc).get("name"));
// 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("Frank", r.document(usThen.scoreDocs[0].doc).get("name"));
@@ -376,14 +377,14 @@ public class TestBlockJoin extends Lucen
s.search(new ToChildBlockJoinQuery(us,
parentsFilter), 10).totalHits );
- assertEquals("java skills in US", 1, s.search(new ToChildBlockJoinQuery(us, parentsFilter),
- skill("java"), 10).totalHits );
+ assertEquals("java skills in US", 1, s.search(new FilteredQuery(new ToChildBlockJoinQuery(us, parentsFilter),
+ skill("java")), 10).totalHits );
BooleanQuery rubyPython = new BooleanQuery();
rubyPython.add(new TermQuery(new Term("skill", "ruby")), Occur.SHOULD);
rubyPython.add(new TermQuery(new Term("skill", "python")), Occur.SHOULD);
- assertEquals("ruby skills in US", 1, s.search(new ToChildBlockJoinQuery(us, parentsFilter),
- new QueryWrapperFilter(rubyPython), 10).totalHits );
+ assertEquals("ruby skills in US", 1, s.search(new FilteredQuery(new ToChildBlockJoinQuery(us, parentsFilter),
+ new QueryWrapperFilter(rubyPython)), 10).totalHits );
r.close();
dir.close();
@@ -785,7 +786,7 @@ public class TestBlockJoin extends Lucen
sortFields.addAll(Arrays.asList(childSort.getSort()));
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);
if (VERBOSE) {
@@ -921,30 +922,24 @@ public class TestBlockJoin extends Lucen
final ToChildBlockJoinQuery parentJoinQuery2 = new ToChildBlockJoinQuery(parentQuery2, parentsFilter);
// To run against the block-join index:
- final Query childJoinQuery2;
+ Query childJoinQuery2;
// Same query as parentJoinQuery, but to run against
// the fully denormalized index (so we can compare
// results):
- final Query childQuery2;
-
- // apply a filter to children
- final Filter childFilter2, childJoinFilter2;
+ Query childQuery2;
if (random().nextBoolean()) {
childQuery2 = parentQuery2;
childJoinQuery2 = parentJoinQuery2;
- childFilter2 = null;
- childJoinFilter2 = null;
} else {
final Term childTerm = randomChildTerm(childFields[0]);
if (random().nextBoolean()) { // filtered case
childJoinQuery2 = parentJoinQuery2;
final Filter f = new QueryWrapperFilter(new TermQuery(childTerm));
- childJoinFilter2 = random().nextBoolean()
- ? new BitDocIdSetCachingWrapperFilter(f): f;
+ childJoinQuery2 = new FilteredQuery(childJoinQuery2, random().nextBoolean()
+ ? new BitDocIdSetCachingWrapperFilter(f): f);
} else {
- childJoinFilter2 = null;
// AND child field w/ parent query:
final BooleanQuery bq = new BooleanQuery();
childJoinQuery2 = bq;
@@ -962,10 +957,9 @@ public class TestBlockJoin extends Lucen
if (random().nextBoolean()) { // filtered case
childQuery2 = parentQuery2;
final Filter f = new QueryWrapperFilter(new TermQuery(childTerm));
- childFilter2 = random().nextBoolean()
- ? new BitDocIdSetCachingWrapperFilter(f): f;
+ childQuery2 = new FilteredQuery(childQuery2, random().nextBoolean()
+ ? new BitDocIdSetCachingWrapperFilter(f): f);
} else {
- childFilter2 = null;
final BooleanQuery bq2 = new BooleanQuery();
childQuery2 = bq2;
if (random().nextBoolean()) {
@@ -984,11 +978,9 @@ public class TestBlockJoin extends Lucen
// Search denormalized index:
if (VERBOSE) {
- System.out.println("TEST: run top down query=" + childQuery2 +
- " filter=" + childFilter2 +
- " sort=" + childSort2);
+ System.out.println("TEST: run top down query=" + childQuery2 + " sort=" + childSort2);
}
- final TopDocs results2 = s.search(childQuery2, childFilter2, r.numDocs(),
+ final TopDocs results2 = s.search(childQuery2, r.numDocs(),
childSort2);
if (VERBOSE) {
System.out.println(" " + results2.totalHits + " totalHits:");
@@ -1000,10 +992,9 @@ public class TestBlockJoin extends Lucen
// Search join index:
if (VERBOSE) {
- System.out.println("TEST: run top down join query=" + childJoinQuery2 +
- " filter=" + childJoinFilter2 + " sort=" + childSort2);
+ System.out.println("TEST: run top down join query=" + childJoinQuery2 + " sort=" + childSort2);
}
- TopDocs joinResults2 = joinS.search(childJoinQuery2, childJoinFilter2, joinR.numDocs(), childSort2);
+ TopDocs joinResults2 = joinS.search(childJoinQuery2, joinR.numDocs(), childSort2);
if (VERBOSE) {
System.out.println(" " + joinResults2.totalHits + " totalHits:");
for(ScoreDoc sd : joinResults2.scoreDocs) {
Modified: lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java Tue Feb 24 18:50:15 2015
@@ -31,6 +31,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
@@ -121,7 +122,7 @@ public class TestBlockJoinValidation ext
Filter childFilter = new QueryWrapperFilter(new TermQuery(new Term("common_field", "1")));
thrown.expect(IllegalStateException.class);
thrown.expectMessage(ToChildBlockJoinQuery.ILLEGAL_ADVANCE_ON_PARENT);
- indexSearcher.search(blockJoinQuery, childFilter, 1);
+ indexSearcher.search(new FilteredQuery(blockJoinQuery, childFilter), 1);
}
@Test
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java Tue Feb 24 18:50:15 2015
@@ -1006,7 +1006,7 @@ public class TestFieldCacheSort extends
Collections.singletonMap("f", Type.SORTED));
w.close();
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);
// null sorts first
assertEquals(1, hits.scoreDocs[0].doc);
@@ -1035,7 +1035,7 @@ public class TestFieldCacheSort extends
Collections.singletonMap("string", Type.SORTED));
IndexSearcher searcher = new IndexSearcher(reader);
try {
- searcher.search(new MatchAllDocsQuery(), null, 500, sort);
+ searcher.search(new MatchAllDocsQuery(), 500, sort);
fail("didn't get expected exception");
} catch (IllegalStateException expected) {}
reader.close();
@@ -1069,10 +1069,10 @@ public class TestFieldCacheSort extends
Query q = new TermQuery(new Term("body", "text"));
IndexSearcher s = newSearcher(r);
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, null, 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, 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, Sort.INDEXORDER, 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, 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, true)}), random().nextBoolean(), true).getMaxScore(), 0.0);
TestUtil.checkReader(r);
r.close();
d.close();
@@ -1084,27 +1084,27 @@ public class TestFieldCacheSort extends
Query query = new TermQuery(new Term("contents", "foo"));
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);
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);
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);
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);
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);
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);
}
@@ -1146,7 +1146,7 @@ public class TestFieldCacheSort extends
TopDocs expected = searcher.search(new TermQuery(new Term("value", "foo")), 10);
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.scoreDocs[0].score, actual.scoreDocs[0].score, 0F);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java Tue Feb 24 18:50:15 2015
@@ -43,6 +43,7 @@ import org.apache.lucene.search.Constant
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Sort;
@@ -173,13 +174,13 @@ public class TestFieldCacheSortRandom ex
// Set minNrShouldMatch to 1 so that BQ will not optimize rewrite to return
// the clause instead of BQ.
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());
+ hitCount, sort, random.nextBoolean(), random.nextBoolean());
} else {
- hits = s.search(new MatchAllDocsQuery(),
- f, hitCount, sort, random.nextBoolean(), random.nextBoolean());
+ hits = s.search(new FilteredQuery(new MatchAllDocsQuery(),
+ f), hitCount, sort, random.nextBoolean(), random.nextBoolean());
}
if (VERBOSE) {
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java Tue Feb 24 18:50:15 2015
@@ -127,7 +127,7 @@ public class TestNumericTerms32 extends
int a=lower; lower=upper; upper=a;
}
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;
ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd);
Modified: lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java (original)
+++ lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java Tue Feb 24 18:50:15 2015
@@ -132,7 +132,7 @@ public class TestNumericTerms64 extends
long a=lower; lower=upper; upper=a;
}
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;
ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd);
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Tue Feb 24 18:50:15 2015
@@ -263,11 +263,11 @@ public class TestCustomScoreQuery extend
log(q5CustomMulAdd);
// do al the searches
- TopDocs td1 = s.search(q1, null, 1000);
- TopDocs td2CustomNeutral = s.search(q2CustomNeutral, null, 1000);
- TopDocs td3CustomMul = s.search(q3CustomMul, null, 1000);
- TopDocs td4CustomAdd = s.search(q4CustomAdd, null, 1000);
- TopDocs td5CustomMulAdd = s.search(q5CustomMulAdd, null, 1000);
+ TopDocs td1 = s.search(q1, 1000);
+ TopDocs td2CustomNeutral = s.search(q2CustomNeutral, 1000);
+ TopDocs td3CustomMul = s.search(q3CustomMul, 1000);
+ TopDocs td4CustomAdd = s.search(q4CustomAdd, 1000);
+ TopDocs td5CustomMulAdd = s.search(q5CustomMulAdd, 1000);
// put results in map so we can verify the scores although they have changed
Map<Integer,Float> h1 = topDocsToMap(td1);
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java Tue Feb 24 18:50:15 2015
@@ -64,7 +64,7 @@ public class TestFieldScoreQuery extends
IndexSearcher s = newSearcher(r);
log("test: "+ functionQuery);
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);
String prevID = "ID"+(N_DOCS+1); // greater than all ids of docs in this test
for (int i=0; i<h.length; i++) {
@@ -95,7 +95,7 @@ public class TestFieldScoreQuery extends
FunctionQuery functionQuery = new FunctionQuery(valueSource);
IndexReader r = DirectoryReader.open(dir);
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);
ScoreDoc sd[] = td.scoreDocs;
for (ScoreDoc aSd : sd) {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java Tue Feb 24 18:50:15 2015
@@ -569,7 +569,7 @@ public class TestValueSources extends Lu
expectedDocs[i] = 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);
CheckHits.checkHits(random(), q, "", searcher, expectedDocs);
CheckHits.checkHitsQuery(q, expected, docs.scoreDocs, expectedDocs);
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java Tue Feb 24 18:50:15 2015
@@ -298,7 +298,7 @@ public class TestMultiFieldQueryParser e
Query q = mfqp.parse("the footest");
IndexReader ir = DirectoryReader.open(ramDir);
IndexSearcher is = newSearcher(ir);
- ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
+ ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(1, hits.length);
ir.close();
ramDir.close();
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java Tue Feb 24 18:50:15 2015
@@ -334,7 +334,7 @@ public class TestMultiFieldQPHelper exte
Query q = mfqp.parse("the footest", null);
IndexReader ir = DirectoryReader.open(ramDir);
IndexSearcher is = newSearcher(ir);
- ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
+ ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(1, hits.length);
ir.close();
ramDir.close();
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java Tue Feb 24 18:50:15 2015
@@ -1257,7 +1257,7 @@ public class TestQPHelper extends Lucene
qp.setLocale(Locale.ENGLISH);
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);
}
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java Tue Feb 24 18:50:15 2015
@@ -1072,7 +1072,7 @@ public abstract class QueryParserTestBas
CommonQueryParserConfiguration qp = getParserConfig( new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
qp.setLocale(Locale.ENGLISH);
Query q = getQuery(query,qp);
- ScoreDoc[] hits = is.search(q, null, 1000).scoreDocs;
+ ScoreDoc[] hits = is.search(q, 1000).scoreDocs;
assertEquals(expected, hits.length);
setDefaultField( oldDefaultField );
}
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Tue Feb 24 18:50:15 2015
@@ -132,7 +132,7 @@ public class TestParser extends LuceneTe
public void testCustomFieldUserQueryXML() throws ParserException, IOException {
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);
}
@@ -199,7 +199,7 @@ public class TestParser extends LuceneTe
List<LeafReaderContext> leaves = searcher.getTopReaderContext().leaves();
Assume.assumeTrue(leaves.size() == 1);
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);
}
@@ -226,7 +226,7 @@ public class TestParser extends LuceneTe
if (VERBOSE) {
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);
if (VERBOSE) {
System.out.println("=========" + qType + "============");
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java Tue Feb 24 18:50:15 2015
@@ -98,7 +98,7 @@ public class TestQueryTemplateManager ex
Query q = builder.getQuery(doc.getDocumentElement());
//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
int expectedHits = Integer.parseInt(queryFormProperties.getProperty("expectedMatches"));
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Tue Feb 24 18:50:15 2015
@@ -25,6 +25,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
@@ -84,7 +85,7 @@ public class DuplicateFilterTest extends
public void testDefaultFilter() throws Throwable {
DuplicateFilter df = new DuplicateFilter(KEY_FIELD);
HashSet<String> results = new HashSet<>();
- ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(new FilteredQuery(tq, df), 1000).scoreDocs;
for (ScoreDoc hit : hits) {
Document d = searcher.doc(hit.doc);
@@ -96,7 +97,7 @@ public class DuplicateFilterTest extends
public void testNoFilter() throws Throwable {
HashSet<String> results = new HashSet<>();
- ScoreDoc[] hits = searcher.search(tq, null, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(tq, 1000).scoreDocs;
assertTrue("Default searching should have found some matches", hits.length > 0);
boolean dupsFound = false;
@@ -114,7 +115,7 @@ public class DuplicateFilterTest extends
DuplicateFilter df = new DuplicateFilter(KEY_FIELD);
df.setProcessingMode(DuplicateFilter.ProcessingMode.PM_FAST_INVALIDATION);
HashSet<String> results = new HashSet<>();
- ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(new FilteredQuery(tq, df), 1000).scoreDocs;
assertTrue("Filtered searching should have found some matches", hits.length > 0);
for (ScoreDoc hit : hits) {
@@ -129,7 +130,7 @@ public class DuplicateFilterTest extends
public void testKeepsLastFilter() throws Throwable {
DuplicateFilter df = new DuplicateFilter(KEY_FIELD);
df.setKeepMode(DuplicateFilter.KeepMode.KM_USE_LAST_OCCURRENCE);
- ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(new FilteredQuery(tq, df), 1000).scoreDocs;
assertTrue("Filtered searching should have found some matches", hits.length > 0);
for (ScoreDoc hit : hits) {
Document d = searcher.doc(hit.doc);
@@ -153,7 +154,7 @@ public class DuplicateFilterTest extends
public void testKeepsFirstFilter() throws Throwable {
DuplicateFilter df = new DuplicateFilter(KEY_FIELD);
df.setKeepMode(DuplicateFilter.KeepMode.KM_USE_FIRST_OCCURRENCE);
- ScoreDoc[] hits = searcher.search(tq, df, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(new FilteredQuery(tq, df), 1000).scoreDocs;
assertTrue("Filtered searching should have found some matches", hits.length > 0);
for (ScoreDoc hit : hits) {
Document d = searcher.doc(hit.doc);
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java Tue Feb 24 18:50:15 2015
@@ -60,32 +60,32 @@ public class TestSlowFuzzyQuery extends
writer.close();
SlowFuzzyQuery query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
// same with prefix
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 1);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 3);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 4);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(2, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 5);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 6);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
// test scoring
query = new SlowFuzzyQuery(new Term("field", "bbbbb"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals("3 documents should match", 3, hits.length);
List<String> order = Arrays.asList("bbbbb","abbbb","aabbb");
for (int i = 0; i < hits.length; i++) {
@@ -97,7 +97,7 @@ public class TestSlowFuzzyQuery extends
// test pq size by supplying maxExpansions=2
// This query would normally return 3 documents, because 3 terms match (see above):
query = new SlowFuzzyQuery(new Term("field", "bbbbb"), SlowFuzzyQuery.defaultMinSimilarity, 0, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals("only 2 documents should match", 2, hits.length);
order = Arrays.asList("bbbbb","abbbb");
for (int i = 0; i < hits.length; i++) {
@@ -108,15 +108,15 @@ public class TestSlowFuzzyQuery extends
// not similar enough:
query = new SlowFuzzyQuery(new Term("field", "xxxxx"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
query = new SlowFuzzyQuery(new Term("field", "aaccc"), SlowFuzzyQuery.defaultMinSimilarity, 0); // edit distance to "aaaaa" = 3
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// query identical to a word in the index:
query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
// default allows for up to two edits:
@@ -125,7 +125,7 @@ public class TestSlowFuzzyQuery extends
// query similar to a word in the index:
query = new SlowFuzzyQuery(new Term("field", "aaaac"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
@@ -133,63 +133,63 @@ public class TestSlowFuzzyQuery extends
// now with prefix
query = new SlowFuzzyQuery(new Term("field", "aaaac"), SlowFuzzyQuery.defaultMinSimilarity, 1);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb"));
query = new SlowFuzzyQuery(new Term("field", "aaaac"), SlowFuzzyQuery.defaultMinSimilarity, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb"));
query = new SlowFuzzyQuery(new Term("field", "aaaac"), SlowFuzzyQuery.defaultMinSimilarity, 3);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(3, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
assertEquals(searcher.doc(hits[2].doc).get("field"), ("aaabb"));
query = new SlowFuzzyQuery(new Term("field", "aaaac"), SlowFuzzyQuery.defaultMinSimilarity, 4);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(2, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaa"));
assertEquals(searcher.doc(hits[1].doc).get("field"), ("aaaab"));
query = new SlowFuzzyQuery(new Term("field", "aaaac"), SlowFuzzyQuery.defaultMinSimilarity, 5);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
query = new SlowFuzzyQuery(new Term("field", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
// now with prefix
query = new SlowFuzzyQuery(new Term("field", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 1);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new SlowFuzzyQuery(new Term("field", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new SlowFuzzyQuery(new Term("field", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 3);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new SlowFuzzyQuery(new Term("field", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 4);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("ddddd"));
query = new SlowFuzzyQuery(new Term("field", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 5);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// different field = no match:
query = new SlowFuzzyQuery(new Term("anotherfield", "ddddX"), SlowFuzzyQuery.defaultMinSimilarity, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
reader.close();
@@ -210,11 +210,11 @@ public class TestSlowFuzzyQuery extends
SlowFuzzyQuery query;
query = new SlowFuzzyQuery(new Term("field", "abcxxxx"), 3f, 0);
- ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
query = new SlowFuzzyQuery(new Term("field", "abcxxxx"), 4f, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
reader.close();
directory.close();
@@ -233,63 +233,63 @@ public class TestSlowFuzzyQuery extends
SlowFuzzyQuery query;
// not similar enough:
query = new SlowFuzzyQuery(new Term("field", "xxxxx"), 0.5f, 0);
- ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// edit distance to "aaaaaaa" = 3, this matches because the string is longer than
// in testDefaultFuzziness so a bigger difference is allowed:
query = new SlowFuzzyQuery(new Term("field", "aaaaccc"), 0.5f, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaaaa"));
// now with prefix
query = new SlowFuzzyQuery(new Term("field", "aaaaccc"), 0.5f, 1);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaaaa"));
query = new SlowFuzzyQuery(new Term("field", "aaaaccc"), 0.5f, 4);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
assertEquals(searcher.doc(hits[0].doc).get("field"), ("aaaaaaa"));
query = new SlowFuzzyQuery(new Term("field", "aaaaccc"), 0.5f, 5);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// no match, more than half of the characters is wrong:
query = new SlowFuzzyQuery(new Term("field", "aaacccc"), 0.5f, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// now with prefix
query = new SlowFuzzyQuery(new Term("field", "aaacccc"), 0.5f, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// "student" and "stellent" are indeed similar to "segment" by default:
query = new SlowFuzzyQuery(new Term("field", "student"), 0.5f, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
query = new SlowFuzzyQuery(new Term("field", "stellent"), 0.5f, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
// now with prefix
query = new SlowFuzzyQuery(new Term("field", "student"), 0.5f, 1);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
query = new SlowFuzzyQuery(new Term("field", "stellent"), 0.5f, 1);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
query = new SlowFuzzyQuery(new Term("field", "student"), 0.5f, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
query = new SlowFuzzyQuery(new Term("field", "stellent"), 0.5f, 2);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// "student" doesn't match anymore thanks to increased minimum similarity:
query = new SlowFuzzyQuery(new Term("field", "student"), 0.6f, 0);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
try {
@@ -363,22 +363,22 @@ public class TestSlowFuzzyQuery extends
Query query;
// term not over 10 chars, so optimization shortcuts
query = new SlowFuzzyQuery(new Term("field", "1234569"), 0.9f);
- ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// 10 chars, so no optimization
query = new SlowFuzzyQuery(new Term("field", "1234567891"), 0.9f);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
// over 10 chars, so no optimization
query = new SlowFuzzyQuery(new Term("field", "12345678911"), 0.9f);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
// over 10 chars, no match
query = new SlowFuzzyQuery(new Term("field", "sdfsdfsdfsdf"), 0.9f);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals(0, hits.length);
reader.close();
@@ -399,7 +399,7 @@ public class TestSlowFuzzyQuery extends
SlowFuzzyQuery query = new SlowFuzzyQuery(new Term("field", "lucene"));
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);
// normally, 'Lucenne' would be the first result as IDF will skew the score.
assertEquals("Lucene", reader.document(hits[0].doc).get("field"));
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java Tue Feb 24 18:50:15 2015
@@ -69,7 +69,7 @@ public class TestRegexQuery extends Luce
if ( capability != null )
query.setRegexImplementation(capability);
- return searcher.search(query, null, 1000).totalHits;
+ return searcher.search(query, 1000).totalHits;
}
private int spanRegexQueryNrHits(String regex1, String regex2, int slop, boolean ordered) throws Exception {
@@ -77,7 +77,7 @@ public class TestRegexQuery extends Luce
SpanQuery srq2 = new SpanMultiTermQueryWrapper<>(new RegexQuery(newTerm(regex2)));
SpanNearQuery query = new SpanNearQuery( new SpanQuery[]{srq1, srq2}, slop, ordered);
- return searcher.search(query, null, 1000).totalHits;
+ return searcher.search(query, 1000).totalHits;
}
public void testMatchAll() throws Exception {
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Tue Feb 24 18:50:15 2015
@@ -73,7 +73,7 @@ public class TestSpanRegexQuery extends
SpanFirstQuery sfq = new SpanFirstQuery(srq, 1);
// SpanNearQuery query = new SpanNearQuery(new SpanQuery[] {srq, stq}, 6,
// true);
- int numHits = searcher.search(sfq, null, 1000).totalHits;
+ int numHits = searcher.search(sfq, 1000).totalHits;
assertEquals(1, numHits);
reader.close();
directory.close();
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java Tue Feb 24 18:50:15 2015
@@ -575,15 +575,16 @@ public class TestTermAutomatonQuery exte
System.out.println(q.toDot());
}
- Filter filter;
+ Query q1 = q;
+ Query q2 = bq;
if (random().nextInt(5) == 1) {
- filter = new RandomFilter(random().nextLong(), random().nextFloat());
- } else {
- filter = null;
+ RandomFilter filter = new RandomFilter(random().nextLong(), random().nextFloat());
+ q1 = new FilteredQuery(q1, filter);
+ q2 = new FilteredQuery(q2, filter);
}
- TopDocs hits1 = s.search(q, filter, numDocs);
- TopDocs hits2 = s.search(bq, filter, numDocs);
+ TopDocs hits1 = s.search(q1, numDocs);
+ TopDocs hits2 = s.search(q2, numDocs);
Set<String> hits1Docs = toDocIDs(s, hits1);
Set<String> hits2Docs = toDocIDs(s, hits2);
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java Tue Feb 24 18:50:15 2015
@@ -21,6 +21,7 @@ import com.spatial4j.core.context.Spatia
import com.spatial4j.core.distance.DistanceUtils;
import com.spatial4j.core.shape.Point;
import com.spatial4j.core.shape.Shape;
+
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
@@ -32,6 +33,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Sort;
@@ -151,7 +153,7 @@ public class SpatialExample extends Luce
SpatialArgs args = new SpatialArgs(SpatialOperation.Intersects,
ctx.makeCircle(-80.0, 33.0, DistanceUtils.dist2Degrees(200, DistanceUtils.EARTH_MEAN_RADIUS_KM)));
Filter filter = strategy.makeFilter(args);
- TopDocs docs = indexSearcher.search(new MatchAllDocsQuery(), filter, 10, idSort);
+ TopDocs docs = indexSearcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), 10, idSort);
assertDocMatchedIds(indexSearcher, docs, 2);
//Now, lets get the distance for the 1st doc via computing from stored point value:
// (this computation is usually not redundant)
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java Tue Feb 24 18:50:15 2015
@@ -31,7 +31,9 @@ import com.spatial4j.core.shape.Rectangl
import com.spatial4j.core.shape.Shape;
import com.spatial4j.core.shape.SpatialRelation;
import com.spatial4j.core.shape.impl.RectangleImpl;
+
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.TotalHitCountCollector;
import org.apache.lucene.spatial.StrategyTestCase;
@@ -235,7 +237,7 @@ public class HeatmapFacetCounterTest ext
Filter filter = new IntersectsPrefixTreeFilter(
pt, strategy.getFieldName(), grid, facetLevel, grid.getMaxLevels(), !strategy.isPointsOnly());
final TotalHitCountCollector collector = new TotalHitCountCollector();
- indexSearcher.search(new MatchAllDocsQuery(), filter, collector);
+ indexSearcher.search(new FilteredQuery(new MatchAllDocsQuery(), filter), collector);
cellsValidated++;
if (collector.getTotalHits() > 0) {
cellValidatedNonZero++;
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Tue Feb 24 18:50:15 2015
@@ -364,7 +364,7 @@ public class SpellChecker implements jav
int maxHits = 10 * numSug;
// System.out.println("Q: " + query);
- ScoreDoc[] hits = indexSearcher.search(query, null, maxHits).scoreDocs;
+ ScoreDoc[] hits = indexSearcher.search(query, maxHits).scoreDocs;
// System.out.println("HITS: " + hits.length());
SuggestWordQueue sugQueue = new SuggestWordQueue(numSug, comparator);
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java Tue Feb 24 18:50:15 2015
@@ -33,6 +33,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -76,11 +77,11 @@ public abstract class CollationTestBase
// Collator (or an Arabic one for the case when Farsi searcher not
// supported).
ScoreDoc[] result = searcher.search
- (query, new TermRangeFilter("content", firstBeg, firstEnd, true, true), 1).scoreDocs;
+ (new FilteredQuery(query, new TermRangeFilter("content", firstBeg, firstEnd, true, true)), 1).scoreDocs;
assertEquals("The index Term should not be included.", 0, result.length);
result = searcher.search
- (query, new TermRangeFilter("content", secondBeg, secondEnd, true, true), 1).scoreDocs;
+ (new FilteredQuery(query, new TermRangeFilter("content", secondBeg, secondEnd, true, true)), 1).scoreDocs;
assertEquals("The index Term should be included.", 1, result.length);
reader.close();
@@ -105,11 +106,11 @@ public abstract class CollationTestBase
IndexSearcher searcher = new IndexSearcher(reader);
Query query = new TermRangeQuery("content", firstBeg, firstEnd, true, true);
- ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
+ ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals("The index Term should not be included.", 0, hits.length);
query = new TermRangeQuery("content", secondBeg, secondEnd, true, true);
- hits = searcher.search(query, null, 1000).scoreDocs;
+ hits = searcher.search(query, 1000).scoreDocs;
assertEquals("The index Term should be included.", 1, hits.length);
reader.close();
dir.close();
@@ -136,12 +137,12 @@ public abstract class CollationTestBase
// not supported).
Query csrq
= new TermRangeQuery("content", firstBeg, firstEnd, true, true);
- ScoreDoc[] result = search.search(csrq, null, 1000).scoreDocs;
+ ScoreDoc[] result = search.search(csrq, 1000).scoreDocs;
assertEquals("The index Term should not be included.", 0, result.length);
csrq = new TermRangeQuery
("content", secondBeg, secondEnd, true, true);
- result = search.search(csrq, null, 1000).scoreDocs;
+ result = search.search(csrq, 1000).scoreDocs;
assertEquals("The index Term should be included.", 1, result.length);
reader.close();
farsiIndex.close();
@@ -151,7 +152,7 @@ public abstract class CollationTestBase
// Copied from TestSort.java
private void assertMatches(IndexSearcher searcher, Query query, Sort sort,
String expectedResult) throws IOException {
- ScoreDoc[] result = searcher.search(query, null, 1000, sort).scoreDocs;
+ ScoreDoc[] result = searcher.search(query, 1000, sort).scoreDocs;
StringBuilder buff = new StringBuilder(10);
int n = result.length;
for (int i = 0 ; i < n ; ++i) {
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java Tue Feb 24 18:50:15 2015
@@ -111,7 +111,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -143,7 +143,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -176,7 +176,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -211,7 +211,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -248,7 +248,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -285,7 +285,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -326,7 +326,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
BytesRef scratch = new BytesRef();
// Iterate through the results:
@@ -488,7 +488,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
@@ -592,7 +592,7 @@ public abstract class BaseDocValuesForma
assertEquals(1, isearcher.search(new TermQuery(new Term("fieldname", longTerm)), 1).totalHits);
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);
BytesRef scratch = new BytesRef();
// Iterate through the results:
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Tue Feb 24 18:50:15 2015
@@ -665,9 +665,9 @@ public abstract class ThreadedIndexingAn
private int runQuery(IndexSearcher s, Query q) throws Exception {
s.search(q, 10);
- int hitCount = s.search(q, null, 10, new Sort(new SortField("titleDV", SortField.Type.STRING))).totalHits;
+ int hitCount = s.search(q, 10, new Sort(new SortField("titleDV", SortField.Type.STRING))).totalHits;
final Sort dvSort = new Sort(new SortField("titleDV", SortField.Type.STRING));
- int hitCount2 = s.search(q, null, 10, dvSort).totalHits;
+ int hitCount2 = s.search(q, 10, dvSort).totalHits;
assertEquals(hitCount, hitCount2);
return hitCount;
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java Tue Feb 24 18:50:15 2015
@@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.TestUtil;
/**
* Helper class that adds some extra checks to ensure correct
@@ -98,13 +97,6 @@ public class AssertingIndexSearcher exte
}
@Override
- protected Query wrapFilter(Query query, Filter filter) {
- if (random.nextBoolean())
- return super.wrapFilter(query, filter);
- return (filter == null) ? query : new FilteredQuery(query, filter, TestUtil.randomFilterStrategy(random));
- }
-
- @Override
protected void search(List<LeafReaderContext> leaves, Weight weight, Collector collector) throws IOException {
// TODO: shouldn't we AssertingCollector.wrap(collector) here?
super.search(leaves, AssertingWeight.wrap(random, weight), AssertingCollector.wrap(random, collector));
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java Tue Feb 24 18:50:15 2015
@@ -424,18 +424,17 @@ public class CheckHits {
super(r);
}
protected void checkExplanations(Query q) throws IOException {
- super.search(q, null,
+ super.search(q,
new ExplanationAsserter
(q, null, this));
}
@Override
public TopFieldDocs search(Query query,
- Filter filter,
int n,
Sort sort) throws IOException {
checkExplanations(query);
- return super.search(query,filter,n,sort);
+ return super.search(query,n,sort);
}
@Override
public void search(Query query, Collector results) throws IOException {
@@ -443,16 +442,10 @@ public class CheckHits {
super.search(query, results);
}
@Override
- public void search(Query query, Filter filter, Collector results) throws IOException {
- checkExplanations(query);
- super.search(query, filter, results);
- }
- @Override
- public TopDocs search(Query query, Filter filter,
- int n) throws IOException {
+ public TopDocs search(Query query, int n) throws IOException {
checkExplanations(query);
- return super.search(query,filter, n);
+ return super.search(query, n);
}
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java Tue Feb 24 18:50:15 2015
@@ -180,11 +180,15 @@ public abstract class SearchEquivalenceT
* Both queries will be filtered by <code>filter</code>
*/
protected void assertSubsetOf(Query q1, Query q2, Filter filter) throws Exception {
+ if (filter != null) {
+ q1 = new FilteredQuery(q1, filter);
+ q2 = new FilteredQuery(q2, filter);
+ }
// we test both INDEXORDER and RELEVANCE because we want to test needsScores=true/false
for (Sort sort : new Sort[] { Sort.INDEXORDER, Sort.RELEVANCE }) {
// not efficient, but simple!
- TopDocs td1 = s1.search(q1, filter, reader.maxDoc(), sort);
- TopDocs td2 = s2.search(q2, filter, reader.maxDoc(), sort);
+ TopDocs td1 = s1.search(q1, reader.maxDoc(), sort);
+ TopDocs td2 = s2.search(q2, reader.maxDoc(), sort);
assertTrue(td1.totalHits <= td2.totalHits);
// fill the superset into a bitset
@@ -222,8 +226,12 @@ public abstract class SearchEquivalenceT
protected void assertSameScores(Query q1, Query q2, Filter filter) throws Exception {
// not efficient, but simple!
- TopDocs td1 = s1.search(q1, filter, reader.maxDoc());
- TopDocs td2 = s2.search(q2, filter, reader.maxDoc());
+ if (filter != null) {
+ q1 = new FilteredQuery(q1, filter);
+ q2 = new FilteredQuery(q2, filter);
+ }
+ TopDocs td1 = s1.search(q1, reader.maxDoc());
+ TopDocs td2 = s2.search(q2, reader.maxDoc());
assertEquals(td1.totalHits, td2.totalHits);
for (int i = 0; i < td1.scoreDocs.length; ++i) {
assertEquals(td1.scoreDocs[i].doc, td2.scoreDocs[i].doc);
Modified: lucene/dev/branches/branch_5x/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java Tue Feb 24 18:50:15 2015
@@ -33,6 +33,7 @@ import java.util.TreeMap;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.Query;
import org.apache.solr.analytics.accumulator.facet.FacetValueAccumulator;
import org.apache.solr.analytics.accumulator.facet.FieldFacetAccumulator;
@@ -611,7 +612,7 @@ public class FacetingAccumulator extends
}
// The searcher sends docIds to the QueryFacetAccumulator which forwards
// them to <code>collectQuery()</code> in this class for collection.
- searcher.search(q, filter, qAcc);
+ searcher.search(new FilteredQuery(q, filter), qAcc);
computeQueryFacet(qfr.getName());
queryCount++;
}
@@ -715,7 +716,7 @@ public class FacetingAccumulator extends
RangeFacetAccumulator rAcc = new RangeFacetAccumulator(this,rfr.getName(),facetValue);
// The searcher sends docIds to the RangeFacetAccumulator which forwards
// them to <code>collectRange()</code> in this class for collection.
- searcher.search(q, filter, rAcc);
+ searcher.search(new FilteredQuery(q, filter), rAcc);
computeRangeFacet(sf.getName());
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BlobHandler.java Tue Feb 24 18:50:15 2015
@@ -119,7 +119,7 @@ public class BlobHandler extends Request
}
TopFieldDocs docs = req.getSearcher().search(new TermQuery(new Term("blobName", blobName)),
- null, 1, new Sort(new SortField("version", SortField.Type.LONG, true)));
+ 1, new Sort(new SortField("version", SortField.Type.LONG, true)));
long version = 0;
if(docs.totalHits >0){
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java Tue Feb 24 18:50:15 2015
@@ -40,6 +40,7 @@ import org.apache.lucene.index.SortedDoc
import org.apache.lucene.queries.TermsQuery;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.QueryWrapperFilter;
@@ -377,7 +378,11 @@ public class ExpandComponent extends Sea
collector = groupExpandCollector;
}
- searcher.search(query, pfilter.filter, collector);
+ if (pfilter.filter == null) {
+ searcher.search(query, collector);
+ } else {
+ searcher.search(new FilteredQuery(query, pfilter.filter), collector);
+ }
LongObjectMap groups = ((GroupCollector)groupExpandCollector).getGroups();
Map<String, DocSlice> outMap = new HashMap<>();
CharsRefBuilder charsRef = new CharsRefBuilder();
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Tue Feb 24 18:50:15 2015
@@ -48,6 +48,7 @@ import org.apache.lucene.index.TermsEnum
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilterCollector;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
@@ -225,7 +226,7 @@ public class SimpleFacets {
return;
}
AbstractAllGroupHeadsCollector allGroupHeadsCollector = grouping.getCommands().get(0).createAllGroupCollector();
- searcher.search(new MatchAllDocsQuery(), base.getTopFilter(), allGroupHeadsCollector);
+ searcher.search(new FilteredQuery(new MatchAllDocsQuery(), base.getTopFilter()), allGroupHeadsCollector);
this.docs = new BitDocSet(allGroupHeadsCollector.retrieveGroupHeads(searcher.maxDoc()));
} else {
this.docs = base;
@@ -325,7 +326,7 @@ public class SimpleFacets {
TermAllGroupsCollector collector = new TermAllGroupsCollector(groupField);
Filter mainQueryFilter = docs.getTopFilter(); // This returns a filter that only matches documents matching with q param and fq params
- searcher.search(facetQuery, mainQueryFilter, collector);
+ searcher.search(new FilteredQuery(facetQuery, mainQueryFilter), collector);
return collector.getGroupCount();
}
@@ -495,7 +496,7 @@ public class SimpleFacets {
if (sf != null && sf.hasDocValues() == false && sf.multiValued() == false && sf.getType().getNumericType() != null) {
// it's a single-valued numeric field: we must currently create insanity :(
// there isn't a GroupedFacetCollector that works on numerics right now...
- searcher.search(new MatchAllDocsQuery(), base.getTopFilter(), new FilterCollector(collector) {
+ searcher.search(new FilteredQuery(new MatchAllDocsQuery(), base.getTopFilter()), new FilterCollector(collector) {
@Override
public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
LeafReader insane = Insanity.wrapInsanity(context.reader(), groupField);
@@ -503,7 +504,7 @@ public class SimpleFacets {
}
});
} else {
- searcher.search(new MatchAllDocsQuery(), base.getTopFilter(), collector);
+ searcher.search(new FilteredQuery(new MatchAllDocsQuery(), base.getTopFilter()), collector);
}
boolean orderByCount = sort.equals(FacetParams.FACET_SORT_COUNT) || sort.equals(FacetParams.FACET_SORT_COUNT_LEGACY);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java Tue Feb 24 18:50:15 2015
@@ -35,6 +35,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.search.CachingCollector;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.MultiCollector;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -449,7 +450,11 @@ public class Grouping {
collector = timeLimitingCollector;
}
try {
- searcher.search(query, luceneFilter, collector);
+ Query q = query;
+ if (luceneFilter != null) {
+ q = new FilteredQuery(q, luceneFilter);
+ }
+ searcher.search(q, collector);
} catch (TimeLimitingCollector.TimeExceededException | ExitableDirectoryReader.ExitingReaderException x) {
logger.warn( "Query: " + query + "; " + x.getMessage() );
qr.setPartialResults(true);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java?rev=1662082&r1=1662081&r2=1662082&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java Tue Feb 24 18:50:15 2015
@@ -110,7 +110,7 @@ if (c.query instanceof TermQuery) {
queryOut[0] = query; filterOut[0] = filter;
return null;
} else {
- return searcher.search(query, filter, numHits);
+ return searcher.search(new FilteredQuery(query, filter), numHits);
}
}