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/25 17:26:51 UTC
svn commit: r1662255 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/search/ lucene/test-framework/
lucene/test-framework/src/java/org/apache/lucene/sear...
Author: jpountz
Date: Wed Feb 25 16:26:50 2015
New Revision: 1662255
URL: http://svn.apache.org/r1662255
Log:
LUCENE-6289: Replace DocValuesRangeFilter with DocValuesRangeQuery.
Added:
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java
- copied unchanged from r1662244, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
- copied, changed from r1662244, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java
- copied, changed from r1662244, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Feb 25 16:26:50 2015
@@ -118,6 +118,9 @@ API Changes
* LUCENE-6268: Replace FieldValueFilter and DocValuesRangeFilter with equivalent
queries that support approximations. (Adrien Grand)
+* LUCENE-6289: Replace DocValuesRangeFilter with DocValuesRangeQuery which
+ supports approximations. (Adrien Grand)
+
* LUCENE-6266: Remove unnecessary Directory params from SegmentInfo.toString,
SegmentInfos.files/toString, and SegmentCommitInfo.toString. (Robert Muir)
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRangeQuery.java Wed Feb 25 16:26:50 2015
@@ -123,45 +123,10 @@ public final class DocValuesRangeQuery e
if (lowerVal == null && upperVal == null) {
throw new IllegalStateException("Both min and max values cannot be null, call rewrite first");
}
- return new Weight(DocValuesRangeQuery.this) {
-
- private float queryNorm;
- private float queryWeight;
-
- @Override
- public float getValueForNormalization() throws IOException {
- queryWeight = getBoost();
- return queryWeight * queryWeight;
- }
-
- @Override
- public void normalize(float norm, float topLevelBoost) {
- queryNorm = norm * topLevelBoost;
- queryWeight *= queryNorm;
- }
-
- @Override
- public Explanation explain(LeafReaderContext context, int doc) throws IOException {
- final Scorer s = scorer(context, context.reader().getLiveDocs());
- final boolean exists = (s != null && s.advance(doc) == doc);
-
- final ComplexExplanation result = new ComplexExplanation();
- if (exists) {
- result.setDescription(DocValuesRangeQuery.this.toString() + ", product of:");
- result.setValue(queryWeight);
- result.setMatch(Boolean.TRUE);
- result.addDetail(new Explanation(getBoost(), "boost"));
- result.addDetail(new Explanation(queryNorm, "queryNorm"));
- } else {
- result.setDescription(DocValuesRangeQuery.this.toString() + " doesn't match id " + doc);
- result.setValue(0);
- result.setMatch(Boolean.FALSE);
- }
- return result;
- }
+ return new ConstantScoreWeight(DocValuesRangeQuery.this) {
@Override
- public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
+ public Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
final Bits docsWithField = context.reader().getDocsWithField(field);
if (docsWithField == null || docsWithField instanceof MatchNoBits) {
@@ -240,7 +205,7 @@ public final class DocValuesRangeQuery e
throw new AssertionError();
}
- return new RangeScorer(this, twoPhaseRange, queryWeight);
+ return new RangeScorer(this, twoPhaseRange, score);
}
};
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsFilter.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsFilter.java Wed Feb 25 16:26:50 2015
@@ -78,8 +78,9 @@ import org.apache.lucene.util.FixedBitSe
*
* <p>
* Which filter is best is very application dependent.
+ * @deprecated Use {@link DocValuesTermsQuery} and boolean {@link BooleanClause.Occur#FILTER} clauses instead
*/
-
+@Deprecated
public class DocValuesTermsFilter extends Filter {
private String field;
private BytesRef[] terms;
Copied: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java (from r1662244, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java?p2=lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java&p1=lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java&r1=1662244&r2=1662255&rev=1662255&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java Wed Feb 25 16:26:50 2015
@@ -98,7 +98,7 @@ public class DocValuesTermsQuery extends
this(field, Arrays.asList(terms));
}
- public DocValuesTermsQuery(String field, String... terms) {
+ public DocValuesTermsQuery(String field, final String... terms) {
this(field, new AbstractList<BytesRef>() {
@Override
public BytesRef get(int index) {
@@ -149,7 +149,7 @@ public class DocValuesTermsQuery extends
return new ConstantScoreWeight(this) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ Scorer scorer(LeafReaderContext context, final Bits acceptDocs, final float score) throws IOException {
final SortedSetDocValues values = DocValues.getSortedSet(context.reader(), field);
final LongBitSet bits = new LongBitSet(values.getValueCount());
for (BytesRef term : terms) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java Wed Feb 25 16:26:50 2015
@@ -61,45 +61,10 @@ public final class FieldValueQuery exten
@Override
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
- return new Weight(this) {
-
- private float queryNorm;
- private float queryWeight;
-
- @Override
- public float getValueForNormalization() throws IOException {
- queryWeight = getBoost();
- return queryWeight * queryWeight;
- }
-
- @Override
- public void normalize(float norm, float topLevelBoost) {
- queryNorm = norm * topLevelBoost;
- queryWeight *= queryNorm;
- }
-
- @Override
- public Explanation explain(LeafReaderContext context, int doc) throws IOException {
- final Scorer s = scorer(context, context.reader().getLiveDocs());
- final boolean exists = (s != null && s.advance(doc) == doc);
-
- final ComplexExplanation result = new ComplexExplanation();
- if (exists) {
- result.setDescription(FieldValueQuery.this.toString() + ", product of:");
- result.setValue(queryWeight);
- result.setMatch(Boolean.TRUE);
- result.addDetail(new Explanation(getBoost(), "boost"));
- result.addDetail(new Explanation(queryNorm, "queryNorm"));
- } else {
- result.setDescription(FieldValueQuery.this.toString() + " doesn't match id " + doc);
- result.setValue(0);
- result.setMatch(Boolean.FALSE);
- }
- return result;
- }
+ return new ConstantScoreWeight(this) {
@Override
- public Scorer scorer(LeafReaderContext context, final Bits acceptDocs) throws IOException {
+ public Scorer scorer(LeafReaderContext context, final Bits acceptDocs, final float score) throws IOException {
final Bits docsWithField = context.reader().getDocsWithField(field);
if (docsWithField == null || docsWithField instanceof MatchNoBits) {
return null;
@@ -161,7 +126,7 @@ public final class FieldValueQuery exten
@Override
public float score() throws IOException {
- return queryWeight;
+ return score;
}
};
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java Wed Feb 25 16:26:50 2015
@@ -71,13 +71,13 @@ public class TestComplexExplanations ext
Occur.SHOULD);
q.add(snear(sf("w3",2), st("w2"), st("w3"), 5, true),
Occur.SHOULD);
-
+
Query t = new FilteredQuery(new TermQuery(new Term(FIELD, "xx")),
- new ItemizedFilter(new int[] {1,3}));
+ new QueryWrapperFilter(new ItemizedQuery(new int[] {1,3})));
t.setBoost(1000);
q.add(t, Occur.SHOULD);
- t = new ConstantScoreQuery(new ItemizedFilter(new int[] {0,2}));
+ t = new ConstantScoreQuery(new ItemizedQuery(new int[] {0,2}));
t.setBoost(30);
q.add(t, Occur.SHOULD);
@@ -136,11 +136,11 @@ public class TestComplexExplanations ext
Occur.SHOULD);
Query t = new FilteredQuery(new TermQuery(new Term(FIELD, "xx")),
- new ItemizedFilter(new int[] {1,3}));
+ new QueryWrapperFilter(new ItemizedQuery(new int[] {1,3})));
t.setBoost(1000);
q.add(t, Occur.SHOULD);
- t = new ConstantScoreQuery(new ItemizedFilter(new int[] {0,2}));
+ t = new ConstantScoreQuery(new ItemizedQuery(new int[] {0,2}));
t.setBoost(-20.0f);
q.add(t, Occur.SHOULD);
@@ -207,13 +207,11 @@ public class TestComplexExplanations ext
public void testFQ5() throws Exception {
TermQuery query = new TermQuery(new Term(FIELD, "xx"));
query.setBoost(0);
- bqtest(new FilteredQuery(query,
- new ItemizedFilter(new int[] {1,3})),
- new int[] {3});
+ bqtest(new FilteredQuery(query, new QueryWrapperFilter(new ItemizedQuery(new int[] {1,3}))), new int[] {3});
}
public void testCSQ4() throws Exception {
- Query q = new ConstantScoreQuery(new ItemizedFilter(new int[] {3}));
+ Query q = new ConstantScoreQuery(new ItemizedQuery(new int[] {3}));
q.setBoost(0);
bqtest(q, new int[] {3});
}
Copied: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java (from r1662244, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java?p2=lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java&p1=lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java&r1=1662244&r2=1662255&rev=1662255&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java Wed Feb 25 16:26:50 2015
@@ -104,6 +104,58 @@ public class TestDocValuesTermsQuery ext
}
}
+ public void testDuelFilter() throws IOException {
+ final int iters = atLeast(2);
+ for (int iter = 0; iter < iters; ++iter) {
+ final List<Term> allTerms = new ArrayList<>();
+ final int numTerms = TestUtil.nextInt(random(), 1, 1 << TestUtil.nextInt(random(), 1, 10));
+ for (int i = 0; i < numTerms; ++i) {
+ final String value = TestUtil.randomAnalysisString(random(), 10, true);
+ allTerms.add(new Term("f", value));
+ }
+ Directory dir = newDirectory();
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
+ final int numDocs = atLeast(100);
+ for (int i = 0; i < numDocs; ++i) {
+ Document doc = new Document();
+ final Term term = allTerms.get(random().nextInt(allTerms.size()));
+ doc.add(new SortedDocValuesField(term.field(), new BytesRef(term.text())));
+ iw.addDocument(doc);
+ }
+ if (numTerms > 1 && random().nextBoolean()) {
+ iw.deleteDocuments(new TermQuery(allTerms.get(0)));
+ }
+ iw.commit();
+ final IndexReader reader = iw.getReader();
+ final IndexSearcher searcher = newSearcher(reader);
+ iw.close();
+
+ if (reader.numDocs() == 0) {
+ // may occasionally happen if all documents got the same term
+ IOUtils.close(reader, dir);
+ continue;
+ }
+
+ for (int i = 0; i < 100; ++i) {
+ final int numQueryTerms = TestUtil.nextInt(random(), 1, 1 << TestUtil.nextInt(random(), 1, 8));
+ List<Term> queryTerms = new ArrayList<>();
+ for (int j = 0; j < numQueryTerms; ++j) {
+ queryTerms.add(allTerms.get(random().nextInt(allTerms.size())));
+ }
+ List<String> bytesTerms = new ArrayList<>();
+ for (Term term : queryTerms) {
+ bytesTerms.add(term.text());
+ }
+ final Query q1 = new ConstantScoreQuery(new DocValuesTermsFilter("f", bytesTerms.toArray(new String[0])));
+ final Query q2 = new DocValuesTermsQuery("f", bytesTerms.toArray(new String[0]));
+ assertSameMatches(searcher, q1, q2, true);
+ }
+
+ reader.close();
+ dir.close();
+ }
+ }
+
public void testApproximation() throws IOException {
final int iters = atLeast(2);
for (int iter = 0; iter < iters; ++iter) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Wed Feb 25 16:26:50 2015
@@ -32,7 +32,7 @@ import java.util.List;
/**
* A basic unit test for FieldCacheTermsFilter
*
- * @see org.apache.lucene.search.DocValuesTermsFilter
+ * @see org.apache.lucene.search.DocValuesTermsQuery
*/
public class TestFieldCacheTermsFilter extends LuceneTestCase {
public void testMissingTerms() throws Exception {
@@ -52,22 +52,21 @@ public class TestFieldCacheTermsFilter e
IndexSearcher searcher = newSearcher(reader);
int numDocs = reader.numDocs();
ScoreDoc[] results;
- MatchAllDocsQuery q = new MatchAllDocsQuery();
List<String> terms = new ArrayList<>();
terms.add("5");
- results = searcher.search(new FilteredQuery(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0]))), numDocs).scoreDocs;
+ results = searcher.search(new DocValuesTermsQuery(fieldName, terms.toArray(new String[0])), numDocs).scoreDocs;
assertEquals("Must match nothing", 0, results.length);
terms = new ArrayList<>();
terms.add("10");
- results = searcher.search(new FilteredQuery(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0]))), numDocs).scoreDocs;
+ results = searcher.search(new DocValuesTermsQuery(fieldName, terms.toArray(new String[0])), numDocs).scoreDocs;
assertEquals("Must match 1", 1, results.length);
terms = new ArrayList<>();
terms.add("10");
terms.add("20");
- results = searcher.search(new FilteredQuery(q, new DocValuesTermsFilter(fieldName, terms.toArray(new String[0]))), numDocs).scoreDocs;
+ results = searcher.search(new DocValuesTermsQuery(fieldName, terms.toArray(new String[0])), numDocs).scoreDocs;
assertEquals("Must match 2", 2, results.length);
reader.close();
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java Wed Feb 25 16:26:50 2015
@@ -105,28 +105,28 @@ public class TestSimpleExplanations exte
public void testFQ1() throws Exception {
qtest(new FilteredQuery(new TermQuery(new Term(FIELD, "w1")),
- new ItemizedFilter(new int[] {0,1,2,3})),
+ new QueryWrapperFilter(new ItemizedQuery(new int[] {0,1,2,3}))),
new int[] {0,1,2,3});
}
public void testFQ2() throws Exception {
qtest(new FilteredQuery(new TermQuery(new Term(FIELD, "w1")),
- new ItemizedFilter(new int[] {0,2,3})),
+ new QueryWrapperFilter(new ItemizedQuery(new int[] {0,2,3}))),
new int[] {0,2,3});
}
public void testFQ3() throws Exception {
qtest(new FilteredQuery(new TermQuery(new Term(FIELD, "xx")),
- new ItemizedFilter(new int[] {1,3})),
+ new QueryWrapperFilter(new ItemizedQuery(new int[] {1,3}))),
new int[] {3});
}
public void testFQ4() throws Exception {
TermQuery termQuery = new TermQuery(new Term(FIELD, "xx"));
termQuery.setBoost(1000);
- qtest(new FilteredQuery(termQuery, new ItemizedFilter(new int[] {1,3})),
+ qtest(new FilteredQuery(termQuery, new QueryWrapperFilter(new ItemizedQuery(new int[] {1,3}))),
new int[] {3});
}
public void testFQ6() throws Exception {
Query q = new FilteredQuery(new TermQuery(new Term(FIELD, "xx")),
- new ItemizedFilter(new int[] {1,3}));
+ new QueryWrapperFilter(new ItemizedQuery(new int[] {1,3})));
q.setBoost(1000);
qtest(q, new int[] {3});
}
@@ -134,15 +134,15 @@ public class TestSimpleExplanations exte
/* ConstantScoreQueries */
public void testCSQ1() throws Exception {
- Query q = new ConstantScoreQuery(new ItemizedFilter(new int[] {0,1,2,3}));
+ Query q = new ConstantScoreQuery(new ItemizedQuery(new int[] {0,1,2,3}));
qtest(q, new int[] {0,1,2,3});
}
public void testCSQ2() throws Exception {
- Query q = new ConstantScoreQuery(new ItemizedFilter(new int[] {1,3}));
+ Query q = new ConstantScoreQuery(new ItemizedQuery(new int[] {1,3}));
qtest(q, new int[] {1,3});
}
public void testCSQ3() throws Exception {
- Query q = new ConstantScoreQuery(new ItemizedFilter(new int[] {0,2}));
+ Query q = new ConstantScoreQuery(new ItemizedQuery(new int[] {0,2}));
q.setBoost(1000);
qtest(q, new int[] {0,2});
}
Modified: lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java Wed Feb 25 16:26:50 2015
@@ -112,7 +112,7 @@ public abstract class BaseExplanationTes
/**
* Convenience subclass of FieldCacheTermsFilter
*/
- public static class ItemizedFilter extends DocValuesTermsFilter {
+ public static class ItemizedQuery extends DocValuesTermsQuery {
private static String[] int2str(int [] terms) {
String [] out = new String[terms.length];
for (int i = 0; i < terms.length; i++) {
@@ -120,7 +120,7 @@ public abstract class BaseExplanationTes
}
return out;
}
- public ItemizedFilter(int [] keys) {
+ public ItemizedQuery(int [] keys) {
super(KEY, int2str(keys));
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java?rev=1662255&r1=1662254&r2=1662255&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java Wed Feb 25 16:26:50 2015
@@ -25,7 +25,7 @@ import org.apache.lucene.queries.TermsQu
import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.DocValuesTermsFilter;
+import org.apache.lucene.search.DocValuesTermsQuery;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.MultiTermQueryWrapperFilter;
import org.apache.lucene.search.Query;
@@ -93,7 +93,7 @@ public class TermsQParserPlugin extends
//note: limited to one val per doc
@Override
Filter makeFilter(String fname, BytesRef[] byteRefs) {
- return new DocValuesTermsFilter(fname, byteRefs);
+ return new QueryWrapperFilter(new DocValuesTermsQuery(fname, byteRefs));
}
};