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

SOLR-303: if facet.limit <=0 then don't increase limit sent to shards, and don't test for refinement 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@668756 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2008-06-17 17:25:36 +00:00
parent 6190ce076f
commit 3050d8339a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/solr/handler/component/FacetComponent.java
View File

@ -159,13 +159,17 @@ public class FacetComponent extends SearchComponent
sreq.params.remove(paramStart + FacetParams.FACET_MINCOUNT);
sreq.params.remove(paramStart + FacetParams.FACET_OFFSET);
// set the initial limit higher in increase accuracy
dff.initialLimit = dff.offset + dff.limit;
dff.initialLimit = (int)(dff.initialLimit * 1.5) + 10;
if(dff.limit > 0) {
// set the initial limit higher in increase accuracy
dff.initialLimit = dff.offset + dff.limit;
dff.initialLimit = (int)(dff.initialLimit * 1.5) + 10;
} else {
dff.initialLimit = dff.limit;
}
// Uncomment the following line when testing to supress over-requesting facets and
// thus cause more facet refinement queries.
// dff.initialLimit = dff.offset + dff.limit;
// if (dff.limit > 0) dff.initialLimit = dff.offset + dff.limit;
sreq.params.set(paramStart + FacetParams.FACET_LIMIT, dff.initialLimit);
}
@ -232,6 +236,7 @@ public class FacetComponent extends SearchComponent
for (DistribFieldFacet dff : fi.topFacets.values()) {
if (dff.limit <= 0) continue; // no need to check these facets for refinement
ShardFacetCount[] counts = dff.getSorted();
int ntop = Math.min(counts.length, dff.offset + dff.limit);
long smallestCount = counts.length == 0 ? 0 : counts[ntop-1].count;
@ -281,7 +286,7 @@ public class FacetComponent extends SearchComponent
FacetInfo fi = rb._facetInfo;
for (ShardResponse srsp: sreq.responses) {
int shardNum = rb.getShardNum(srsp.shard);
// int shardNum = rb.getShardNum(srsp.shard);
NamedList facet_counts = (NamedList)srsp.rsp.getResponse().get("facet_counts");
NamedList facet_queries = (NamedList)facet_counts.get("facet_queries");
@ -339,7 +344,7 @@ public class FacetComponent extends SearchComponent
facet_fields.add(dff.field, fieldCounts);
ShardFacetCount[] counts = dff.countSorted;
if (dff.needRefinements) {
if (counts == null || dff.needRefinements) {
counts = dff.getSorted();
}