You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2015/02/16 06:06:32 UTC
svn commit: r1660028 - 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/facet/
lucene/facet/src/java/org/apache/lucene/facet/range/ lucene/fa...
Author: rjernst
Date: Mon Feb 16 05:06:31 2015
New Revision: 1660028
URL: http://svn.apache.org/r1660028
Log:
LUCENE-6245: Force Filter subclasses to implement toString API from Query (merged 1659982)
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/DocTermOrdsRewriteMethod.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Filter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PrefixFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Query.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/MockFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (contents, props changed)
lucene/dev/branches/branch_5x/lucene/facet/ (props changed)
lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java
lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java
lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
lucene/dev/branches/branch_5x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
lucene/dev/branches/branch_5x/lucene/join/ (props changed)
lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
lucene/dev/branches/branch_5x/lucene/misc/ (props changed)
lucene/dev/branches/branch_5x/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
lucene/dev/branches/branch_5x/lucene/queries/ (props changed)
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermFilter.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java
lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
lucene/dev/branches/branch_5x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
lucene/dev/branches/branch_5x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java (contents, props changed)
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.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/BitDocSet.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSetBase.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSort.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=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Mon Feb 16 05:06:31 2015
@@ -85,6 +85,9 @@ API Changes
* LUCENE-1518: Make Filter extend Query and return 0 as score.
(Uwe Schindler, Adrien Grand)
+* LUCENE-6245: Force Filter subclasses to implement toString API from Query.
+ (Ryan Ernst)
+
Other
* LUCENE-6193: Collapse identical catch branches in try-catch statements.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocTermOrdsRewriteMethod.java Mon Feb 16 05:06:31 2015
@@ -55,9 +55,9 @@ public final class DocTermOrdsRewriteMet
}
@Override
- public String toString() {
+ public String toString(String field) {
// query.toString should be ok for the filter, too, if the query boost is 1.0f
- return query.toString();
+ return query.toString(field);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java Mon Feb 16 05:06:31 2015
@@ -55,9 +55,9 @@ public final class DocValuesRewriteMetho
}
@Override
- public String toString() {
+ public String toString(String field) {
// query.toString should be ok for the filter, too, if the query boost is 1.0f
- return query.toString();
+ return query.toString(field);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Filter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Filter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Filter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Filter.java Mon Feb 16 05:06:31 2015
@@ -76,11 +76,6 @@ public abstract class Filter extends Que
}
@Override
- public String toString(String field) {
- return getClass().getSimpleName();
- }
-
- @Override
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
return new Weight(this) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java Mon Feb 16 05:06:31 2015
@@ -52,9 +52,9 @@ public class MultiTermQueryWrapperFilter
}
@Override
- public String toString() {
+ public String toString(String field) {
// query.toString should be ok for the filter, too, if the query boost is 1.0f
- return query.toString();
+ return query.toString(field);
}
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PrefixFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PrefixFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/PrefixFilter.java Mon Feb 16 05:06:31 2015
@@ -31,9 +31,9 @@ public class PrefixFilter extends MultiT
public Term getPrefix() { return query.getPrefix(); }
- /** Prints a user-readable version of this query. */
+ /** Prints a user-readable version of this filter. */
@Override
- public String toString () {
+ public String toString(String field) {
StringBuilder buffer = new StringBuilder();
buffer.append("PrefixFilter(");
buffer.append(getPrefix().toString());
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Query.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Query.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Query.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/Query.java Mon Feb 16 05:06:31 2015
@@ -65,7 +65,7 @@ public abstract class Query implements C
/** Prints a query to a string. */
@Override
- public String toString() {
+ public final String toString() {
return toString("");
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java Mon Feb 16 05:06:31 2015
@@ -137,6 +137,11 @@ final class JustCompileSearch {
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
+
+ @Override
+ public String toString(String field) {
+ return "JustCompileFilter";
+ }
}
static final class JustCompileFilteredDocIdSet extends FilteredDocIdSet {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/MockFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/MockFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/MockFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/MockFilter.java Mon Feb 16 05:06:31 2015
@@ -32,6 +32,11 @@ public class MockFilter extends Filter {
return new BitDocIdSet(bits);
}
+ @Override
+ public String toString(String field) {
+ return "MockFilter";
+ }
+
public void clear() {
wasCalled = false;
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/SingleDocTestFilter.java Mon Feb 16 05:06:31 2015
@@ -38,4 +38,9 @@ public class SingleDocTestFilter extends
if (acceptDocs != null && !acceptDocs.get(doc)) bits.clear(doc);
return new BitDocIdSet(bits);
}
+
+ @Override
+ public String toString(String field) {
+ return "SingleDocTestFilter(" + doc + ")";
+ }
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Mon Feb 16 05:06:31 2015
@@ -181,6 +181,10 @@ public class TestCachingWrapperFilter ex
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
+ @Override
+ public String toString(String field) {
+ return "nullDocIdSetFilter";
+ }
};
CachingWrapperFilter cacher = new CachingWrapperFilter(filter, MAYBE_CACHE_POLICY);
@@ -214,6 +218,10 @@ public class TestCachingWrapperFilter ex
}
};
}
+ @Override
+ public String toString(String field) {
+ return "nullDocIdSetIteratorFilter";
+ }
};
CachingWrapperFilter cacher = new CachingWrapperFilter(filter, FilterCachingPolicy.ALWAYS_CACHE);
@@ -267,6 +275,10 @@ public class TestCachingWrapperFilter ex
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return new BitDocIdSet(new FixedBitSet(context.reader().maxDoc()));
}
+ @Override
+ public String toString(String field) {
+ return "cacheableFilter";
+ }
}, true);
reader.close();
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java Mon Feb 16 05:06:31 2015
@@ -127,6 +127,10 @@ public class TestDocIdSet extends Lucene
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
+ @Override
+ public String toString(String field) {
+ return "nullDocIdSetFilter";
+ }
};
Assert.assertEquals(0, searcher.search(new MatchAllDocsQuery(), f, 10).totalHits);
@@ -169,6 +173,10 @@ public class TestDocIdSet extends Lucene
}
};
}
+ @Override
+ public String toString(String field) {
+ return "nullDocIdSetFilter";
+ }
};
Assert.assertEquals(0, searcher.search(new MatchAllDocsQuery(), f, 10).totalHits);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java Mon Feb 16 05:06:31 2015
@@ -113,6 +113,10 @@ public class TestFilteredQuery extends L
if (acceptDocs.get(3)) bitset.set(3);
return new BitDocIdSet(bitset);
}
+ @Override
+ public String toString(String field) {
+ return "staticFilterB";
+ }
};
}
@@ -194,6 +198,10 @@ public class TestFilteredQuery extends L
bitset.set(0, Math.min(5, bitset.length()));
return new BitDocIdSet(bitset);
}
+ @Override
+ public String toString(String field) {
+ return "staticFilterA";
+ }
};
}
@@ -480,6 +488,10 @@ public class TestFilteredQuery extends L
};
}
+ @Override
+ public String toString(String field) {
+ return "filterField0";
+ }
}, FilteredQuery.QUERY_FIRST_FILTER_STRATEGY);
TopDocs search = searcher.search(query, 10);
@@ -559,7 +571,13 @@ public class TestFilteredQuery extends L
};
}
+
};
+
+ }
+ @Override
+ public String toString(String field) {
+ return "filterField0";
}
}, queryFirst ? FilteredQuery.LEAP_FROG_QUERY_FIRST_STRATEGY : random()
.nextBoolean() ? FilteredQuery.RANDOM_ACCESS_FILTER_STRATEGY
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java Mon Feb 16 05:06:31 2015
@@ -101,6 +101,11 @@ public class TestFilteredSearch extends
}
return set.cardinality() == 0 ? null : new BitDocIdSet(set);
}
+
+ @Override
+ public String toString(String field) {
+ return "SimpleDocIdSetFilter";
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java Mon Feb 16 05:06:31 2015
@@ -350,6 +350,11 @@ public class TestLRUFilterCache extends
return null;
}
+ @Override
+ public String toString(String field) {
+ return "DummyFilter";
+ }
+
}
// Test what happens when the cache contains only filters and doc id sets
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java Mon Feb 16 05:06:31 2015
@@ -149,6 +149,10 @@ public class TestScorerPerf extends Luce
assertNull("acceptDocs should be null, as we have an index without deletions", acceptDocs);
return new BitDocIdSet(rnd);
}
+ @Override
+ public String toString(String field) {
+ return "randomBitSetFilter";
+ }
});
bq.add(q, BooleanClause.Occur.MUST);
if (validate) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java Mon Feb 16 05:06:31 2015
@@ -263,5 +263,10 @@ public class TestSortRandom extends Luce
return new BitDocIdSet(bits);
}
+
+ @Override
+ public String toString(String field) {
+ return "RandomFilter(density=" + density + ")";
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java Mon Feb 16 05:06:31 2015
@@ -105,7 +105,7 @@ public final class DoubleRange extends R
return new Filter() {
@Override
- public String toString() {
+ public String toString(String field) {
return "Filter(" + DoubleRange.this.toString() + ")";
}
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java Mon Feb 16 05:06:31 2015
@@ -97,7 +97,7 @@ public final class LongRange extends Ran
return new Filter() {
@Override
- public String toString() {
+ public String toString(String field) {
return "Filter(" + LongRange.this.toString() + ")";
}
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java Mon Feb 16 05:06:31 2015
@@ -660,6 +660,10 @@ public class TestDrillSideways extends F
}
return new BitDocIdSet(bits);
}
+ @Override
+ public String toString(String field) {
+ return "drillSidewaysTestFilter";
+ }
};
} else {
filter = null;
Modified: lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java Mon Feb 16 05:06:31 2015
@@ -943,6 +943,10 @@ public class FieldQueryTest extends Abst
throws IOException {
return null;
}
+ @Override
+ public String toString(String field) {
+ return "filterToBeFlattened";
+ }
});
query.setBoost(boost);
FieldQuery fq = new FieldQuery( query, true, true );
Modified: lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/java/org/apache/lucene/search/join/BitDocIdSetCachingWrapperFilter.java Mon Feb 16 05:06:31 2015
@@ -81,7 +81,7 @@ public class BitDocIdSetCachingWrapperFi
}
@Override
- public String toString() {
+ public String toString(String field) {
return filter.toString();
}
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=1660028&r1=1660027&r2=1660028&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 Mon Feb 16 05:06:31 2015
@@ -293,5 +293,10 @@ public class TestFieldCacheSortRandom ex
return new BitDocIdSet(bits);
}
+
+ @Override
+ public String toString(String field) {
+ return "RandomFilter(density=" + density + ")";
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/TermFilter.java Mon Feb 16 05:06:31 2015
@@ -37,7 +37,7 @@ public class TermFilter extends QueryWra
}
@Override
- public String toString() {
+ public String toString(String field) {
return getQuery().toString();
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java Mon Feb 16 05:06:31 2015
@@ -96,6 +96,10 @@ public class BooleanFilterTest extends L
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return new BitDocIdSet(new FixedBitSet(context.reader().maxDoc()));
}
+ @Override
+ public String toString(String field) {
+ return "emptyFilter";
+ }
};
}
@@ -105,6 +109,10 @@ public class BooleanFilterTest extends L
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return null;
}
+ @Override
+ public String toString(String field) {
+ return "nullDISFilter";
+ }
};
}
@@ -114,6 +122,10 @@ public class BooleanFilterTest extends L
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return DocIdSet.EMPTY;
}
+ @Override
+ public String toString(String field) {
+ return "nullDISIFilter";
+ }
};
}
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java Mon Feb 16 05:06:31 2015
@@ -38,14 +38,9 @@ abstract class RewriteQuery<SQ extends S
abstract public Query rewrite(IndexReader reader) throws IOException;
@Override
- public String toString() {
- return toString(null);
- }
-
- @Override
public String toString(String field) {
return getClass().getName()
- + (field == null ? "" : "(unused: " + field + ")")
+ + (field.isEmpty() ? "" : "(unused: " + field + ")")
+ "(" + fieldName
+ ", " + srndQuery.toString()
+ ", " + qf.toString()
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/NumericRangeFilterBuilder.java Mon Feb 16 05:06:31 2015
@@ -159,5 +159,10 @@ public class NumericRangeFilterBuilder i
return null;
}
+
+ @Override
+ public String toString(String field) {
+ return "NoMatchFilter()";
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Mon Feb 16 05:06:31 2015
@@ -206,6 +206,15 @@ public class DuplicateFilter extends Fil
}
@Override
+ public String toString(String field) {
+ return "DuplicateFilter(" +
+ "fieldName=" + fieldName +"," +
+ "keepMode=" + (keepMode == KeepMode.KM_USE_FIRST_OCCURRENCE ? "first" : "last") + "," +
+ "processingMode=" + (processingMode == ProcessingMode.PM_FAST_INVALIDATION ? "fast" : "full") +
+ ")";
+ }
+
+ @Override
public int hashCode() {
int hash = 217;
hash = 31 * hash + keepMode.hashCode();
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=1660028&r1=1660027&r2=1660028&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 Mon Feb 16 05:06:31 2015
@@ -643,5 +643,10 @@ public class TestTermAutomatonQuery exte
return new BitDocIdSet(bits);
}
+
+ @Override
+ public String toString(String field) {
+ return "RandomFilter(seed=" + seed + ",density=" + density + ")";
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeFilter.java Mon Feb 16 05:06:31 2015
@@ -75,6 +75,16 @@ public class ContainsPrefixTreeFilter ex
}
@Override
+ public String toString(String field) {
+ return "ContainsPrefixTreeFilter(" +
+ // TODO: print something about the shape?
+ "fieldName=" + fieldName + "," +
+ "detailLevel=" + detailLevel + "," +
+ "multiOverlappingIndexedShapes=" + multiOverlappingIndexedShapes +
+ ")";
+ }
+
+ @Override
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
return new ContainsVisitor(context, acceptDocs).visit(grid.getWorldCell(), acceptDocs);
}
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeFilter.java Mon Feb 16 05:06:31 2015
@@ -84,4 +84,15 @@ public class IntersectsPrefixTreeFilter
}.getDocIdSet();
}
+ @Override
+ public String toString(String field) {
+ return "IntersectsPrefixTreeFilter(" +
+ // TODO: print something about the shape?
+ "fieldName=" + fieldName + "," +
+ "detailLevel=" + detailLevel + "," +
+ "prefixGridScanLevel=" + prefixGridScanLevel + "," +
+ "hasIndexedLeaves=" + hasIndexedLeaves +
+ ")";
+ }
+
}
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java Mon Feb 16 05:06:31 2015
@@ -116,6 +116,11 @@ public class PrefixTreeFacetCounter {
// traversal code. TODO consider refactoring if/when it makes sense (more use cases than this)
new AbstractVisitingPrefixTreeFilter(queryShape, strategy.getFieldName(), tree, facetLevel, scanLevel,
!strategy.isPointsOnly()) {
+
+ @Override
+ public String toString(String field) {
+ return "anonPrefixTreeFilter";
+ }
@Override
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) throws IOException {
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeFilter.java Mon Feb 16 05:06:31 2015
@@ -90,6 +90,17 @@ public class WithinPrefixTreeFilter exte
result = 31 * result + (bufferedQueryShape != null ? bufferedQueryShape.hashCode() : 0);
return result;
}
+
+ @Override
+ public String toString(String field) {
+ return "WithinPrefixTreeFilter(" +
+ // TODO: print something about the shape?
+ "fieldName=" + fieldName + "," +
+ "detailLevel=" + detailLevel + "," +
+ "prefixGridScanLevel=" + prefixGridScanLevel + "," +
+ "hasIndexedLeaves=" + hasIndexedLeaves +
+ ")";
+ }
/** Returns a new shape that is larger than shape by at distErr.
*/
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java Mon Feb 16 05:06:31 2015
@@ -196,6 +196,13 @@ public class SerializedDVStrategy extend
public int hashCode() {
return predicateValueSource.hashCode();
}
+
+ @Override
+ public String toString(String field) {
+ return "PredicateValueSourceFilter(" +
+ predicateValueSource.toString() +
+ ")";
+ }
}//PredicateValueSourceFilter
/**
Modified: lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ValueSourceFilter.java Mon Feb 16 05:06:31 2015
@@ -62,4 +62,14 @@ public class ValueSourceFilter extends F
}
};
}
+
+ @Override
+ public String toString(String field) {
+ return "ValueSourceFilter(" +
+ "startingFilter=" + startingFilter.toString(field) + "," +
+ "source=" + source.toString() + "," +
+ "min=" + min + "," +
+ "max=" + max +
+ ")";
+ }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/BitDocSet.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/BitDocSet.java Mon Feb 16 05:06:31 2015
@@ -358,6 +358,10 @@ public class BitDocSet extends DocSetBas
}, acceptDocs2);
}
+ @Override
+ public String toString(String field) {
+ return "BitSetDocTopFilter";
+ }
};
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSetBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSetBase.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSetBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/DocSetBase.java Mon Feb 16 05:06:31 2015
@@ -229,6 +229,10 @@ abstract class DocSetBase implements Doc
}, acceptDocs2);
}
+ @Override
+ public String toString(String field) {
+ return "DocSetTopFilter";
+ }
};
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java Mon Feb 16 05:06:31 2015
@@ -150,6 +150,7 @@ public class ReRankQParserPlugin extends
return new ReRankCollector(reRankDocs, length, reRankQuery, reRankWeight, cmd, searcher, boostedPriority);
}
+ @Override
public String toString(String s) {
return "{!rerank mainQuery='"+mainQuery.toString()+
"' reRankQuery='"+reRankQuery.toString()+
@@ -157,10 +158,6 @@ public class ReRankQParserPlugin extends
" reRankWeigh="+reRankWeight+"}";
}
- public String toString() {
- return toString(null);
- }
-
public Query rewrite(IndexReader reader) throws IOException {
return wrap(this.mainQuery.rewrite(reader));
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Mon Feb 16 05:06:31 2015
@@ -2455,6 +2455,11 @@ class FilterImpl extends Filter {
return new FilterSet(sub, context);
}
+ @Override
+ public String toString(String field) {
+ return "SolrFilter";
+ }
+
private class FilterSet extends DocIdSet {
DocIdSet docIdSet;
LeafReaderContext context;
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java Mon Feb 16 05:06:31 2015
@@ -779,6 +779,10 @@ public class SortedIntDocSet extends Doc
}, acceptDocs2);
}
+ @Override
+ public String toString(String field) {
+ return "SortedIntDocSetTopFilter";
+ }
};
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java Mon Feb 16 05:06:31 2015
@@ -98,7 +98,7 @@ public class ValueSourceRangeFilter exte
}
@Override
- public String toString() {
+ public String toString(String field) {
StringBuilder sb = new StringBuilder();
sb.append("frange(");
sb.append(valueSource);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java Mon Feb 16 05:06:31 2015
@@ -48,11 +48,6 @@ public class IgnoreAcceptDocsQuery exten
}
@Override
- public String toString() {
- return q.toString();
- }
-
- @Override
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
Weight inner = q.createWeight(searcher, needsScores);
return new IADWeight(inner);
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java Mon Feb 16 05:06:31 2015
@@ -126,10 +126,7 @@ public class TestRankQueryPlugin extends
return q.getBoost();
}
- public String toString() {
- return q.toString();
- }
-
+ @Override
public String toString(String field) {
return q.toString(field);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1660028&r1=1660027&r2=1660028&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/TestSort.java Mon Feb 16 05:06:31 2015
@@ -239,6 +239,10 @@ public class TestSort extends SolrTestCa
public DocIdSet getDocIdSet(LeafReaderContext context, Bits acceptDocs) {
return BitsFilteredDocIdSet.wrap(randSet(context.reader().maxDoc()), acceptDocs);
}
+ @Override
+ public String toString(String field) {
+ return "TestSortFilter";
+ }
};
int top = r.nextInt((ndocs>>3)+1)+1;