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

SOLR-2111: improve facet exception handling, change exception return type 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@995253 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-09-08 21:07:13 +00:00
parent 44f3a3bfe4
commit 8b396e93ed
4 changed files with 277 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
solr/CHANGES.txt
View File

@ -460,6 +460,12 @@ Bug Fixes
* SOLR-2107: MoreLikeThisHandler doesn't work with alternate qparsers. (yonik) * SOLR-2107: MoreLikeThisHandler doesn't work with alternate qparsers. (yonik)
* SOLR-2111: Change exception handling in distributed faceting to work more
like non-distributed faceting, change facet_counts/exception from a String
to a List<String> to enable listing all exceptions that happened, and
prevent an exception in one facet command from affecting another
facet command. (yonik)
Other Changes Other Changes
---------------------- ----------------------

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

@ -209,9 +209,9 @@ public class FacetComponent extends SearchComponent
dff.initialLimit = dff.limit; dff.initialLimit = dff.limit;
} }
// TEST: Uncomment the following line when testing to supress over-requesting facets and // Currently this is for testing only and allows overriding of the
// thus cause more facet refinement queries. // facet.limit set to the shards
// if (dff.limit > 0) dff.initialLimit = dff.offset + dff.limit; dff.initialLimit = rb.req.getParams().getInt("facet.shard.limit", dff.initialLimit);
sreq.params.set(paramStart + FacetParams.FACET_LIMIT, dff.initialLimit); sreq.params.set(paramStart + FacetParams.FACET_LIMIT, dff.initialLimit);
} }
@ -243,6 +243,8 @@ public class FacetComponent extends SearchComponent
int shardNum = rb.getShardNum(srsp.getShard()); int shardNum = rb.getShardNum(srsp.getShard());
NamedList facet_counts = (NamedList)srsp.getSolrResponse().getResponse().get("facet_counts"); NamedList facet_counts = (NamedList)srsp.getSolrResponse().getResponse().get("facet_counts");
fi.addExceptions((List)facet_counts.get("exception"));
// handle facet queries // handle facet queries
NamedList facet_queries = (NamedList)facet_counts.get("facet_queries"); NamedList facet_queries = (NamedList)facet_counts.get("facet_queries");
if (facet_queries != null) { if (facet_queries != null) {
@ -256,17 +258,11 @@ public class FacetComponent extends SearchComponent
// step through each facet.field, adding results from this shard // step through each facet.field, adding results from this shard
NamedList facet_fields = (NamedList)facet_counts.get("facet_fields"); NamedList facet_fields = (NamedList)facet_counts.get("facet_fields");
// an error could cause facet_fields to come back null if (facet_fields != null) {
if (facet_fields == null) { for (DistribFieldFacet dff : fi.facets.values()) {
String msg = (String)facet_counts.get("exception"); dff.add(shardNum, (NamedList)facet_fields.get(dff.getKey()), dff.initialLimit);
if (msg == null) msg = "faceting exception in sub-request - missing facet_fields"; }
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, msg);
}
for (DistribFieldFacet dff : fi.facets.values()) {
dff.add(shardNum, (NamedList)facet_fields.get(dff.getKey()), dff.initialLimit);
} }
} }
@ -337,6 +333,10 @@ public class FacetComponent extends SearchComponent
NamedList facet_counts = (NamedList)srsp.getSolrResponse().getResponse().get("facet_counts"); NamedList facet_counts = (NamedList)srsp.getSolrResponse().getResponse().get("facet_counts");
NamedList facet_fields = (NamedList)facet_counts.get("facet_fields"); NamedList facet_fields = (NamedList)facet_counts.get("facet_fields");
fi.addExceptions((List)facet_counts.get("exception"));
if (facet_fields == null) continue; // this can happen when there's an exception
for (int i=0; i<facet_fields.size(); i++) { for (int i=0; i<facet_fields.size(); i++) {
String key = facet_fields.getName(i); String key = facet_fields.getName(i);
DistribFieldFacet dff = (DistribFieldFacet)fi.facets.get(key); DistribFieldFacet dff = (DistribFieldFacet)fi.facets.get(key);
@ -364,6 +364,11 @@ public class FacetComponent extends SearchComponent
FacetInfo fi = rb._facetInfo; FacetInfo fi = rb._facetInfo;
NamedList facet_counts = new SimpleOrderedMap(); NamedList facet_counts = new SimpleOrderedMap();
if (fi.exceptionList != null) {
facet_counts.add("exception",fi.exceptionList);
}
NamedList facet_queries = new SimpleOrderedMap(); NamedList facet_queries = new SimpleOrderedMap();
facet_counts.add("facet_queries",facet_queries); facet_counts.add("facet_queries",facet_queries);
for (QueryFacet qf : fi.queryFacets.values()) { for (QueryFacet qf : fi.queryFacets.values()) {
@ -460,6 +465,7 @@ public class FacetComponent extends SearchComponent
public static class FacetInfo { public static class FacetInfo {
public LinkedHashMap<String,QueryFacet> queryFacets; public LinkedHashMap<String,QueryFacet> queryFacets;
public LinkedHashMap<String,DistribFieldFacet> facets; public LinkedHashMap<String,DistribFieldFacet> facets;
public List exceptionList;
void parse(SolrParams params, ResponseBuilder rb) { void parse(SolrParams params, ResponseBuilder rb) {
queryFacets = new LinkedHashMap<String,QueryFacet>(); queryFacets = new LinkedHashMap<String,QueryFacet>();
@ -482,6 +488,12 @@ public class FacetComponent extends SearchComponent
} }
} }
} }
public void addExceptions(List exceptions) {
if (exceptions == null) return;
if (exceptionList == null) exceptionList = new ArrayList();
exceptionList.addAll(exceptions);
}
} }
/** /**
@ -604,7 +616,8 @@ public class FacetComponent extends SearchComponent
} }
void add(int shardNum, NamedList shardCounts, int numRequested) { void add(int shardNum, NamedList shardCounts, int numRequested) {
int sz = shardCounts.size(); // shardCounts could be null if there was an exception
int sz = shardCounts == null ? 0 : shardCounts.size();
int numReceived = sz; int numReceived = sz;
OpenBitSet terms = new OpenBitSet(termNum+sz); OpenBitSet terms = new OpenBitSet(termNum+sz);

410
solr/src/java/org/apache/solr/request/SimpleFacets.java
View File

@ -71,6 +71,8 @@ public class SimpleFacets {
protected SolrQueryRequest req; protected SolrQueryRequest req;
protected ResponseBuilder rb; protected ResponseBuilder rb;
protected SimpleOrderedMap facetResponse;
public final Date NOW = new Date(); public final Date NOW = new Date();
// per-facet values // per-facet values
@ -182,19 +184,29 @@ public class SimpleFacets {
if (!params.getBool(FacetParams.FACET,true)) if (!params.getBool(FacetParams.FACET,true))
return null; return null;
NamedList res = new SimpleOrderedMap(); facetResponse = new SimpleOrderedMap();
try { try {
facetResponse.add("facet_queries", getFacetQueryCounts());
res.add("facet_queries", getFacetQueryCounts()); facetResponse.add("facet_fields", getFacetFieldCounts());
res.add("facet_fields", getFacetFieldCounts()); facetResponse.add("facet_dates", getFacetDateCounts());
res.add("facet_dates", getFacetDateCounts()); facetResponse.add("facet_ranges", getFacetRangeCounts());
res.add("facet_ranges", getFacetRangeCounts());
} catch (Exception e) { } catch (Exception e) {
SolrException.logOnce(SolrCore.log, "Exception during facet counts", e); SolrException.logOnce(SolrCore.log, "Exception during facet counts", e);
res.add("exception", SolrException.toStr(e)); addException("Exception during facet counts", e);
} }
return res; return facetResponse;
}
public void addException(String msg, Exception e) {
List exceptions = (List)facetResponse.get("exception");
if (exceptions == null) {
exceptions = new ArrayList();
facetResponse.add("exception", exceptions);
}
String entry = msg + '\n' + SolrException.toStr(e);
exceptions.add(entry);
} }
/** /**
@ -215,13 +227,21 @@ public class SimpleFacets {
// SolrQueryParser qp = searcher.getSchema().getSolrQueryParser(null); // SolrQueryParser qp = searcher.getSchema().getSolrQueryParser(null);
String[] facetQs = params.getParams(FacetParams.FACET_QUERY); String[] facetQs = params.getParams(FacetParams.FACET_QUERY);
if (null != facetQs && 0 != facetQs.length) { if (null != facetQs && 0 != facetQs.length) {
for (String q : facetQs) { for (String q : facetQs) {
parseParams(FacetParams.FACET_QUERY, q); try {
parseParams(FacetParams.FACET_QUERY, q);
// TODO: slight optimization would prevent double-parsing of any localParams // TODO: slight optimization would prevent double-parsing of any localParams
Query qobj = QParser.getParser(q, null, req).getQuery(); Query qobj = QParser.getParser(q, null, req).getQuery();
res.add(key, searcher.numDocs(qobj, base)); res.add(key, searcher.numDocs(qobj, base));
}
catch (Exception e) {
String msg = "Exception during facet.query of " + q;
SolrException.logOnce(SolrCore.log, msg, e);
addException(msg , e);
}
} }
} }
@ -325,12 +345,18 @@ public class SimpleFacets {
String[] facetFs = params.getParams(FacetParams.FACET_FIELD); String[] facetFs = params.getParams(FacetParams.FACET_FIELD);
if (null != facetFs) { if (null != facetFs) {
for (String f : facetFs) { for (String f : facetFs) {
parseParams(FacetParams.FACET_FIELD, f); try {
String termList = localParams == null ? null : localParams.get(CommonParams.TERMS); parseParams(FacetParams.FACET_FIELD, f);
if (termList != null) { String termList = localParams == null ? null : localParams.get(CommonParams.TERMS);
res.add(key, getListedTermCounts(facetValue, termList)); if (termList != null) {
} else { res.add(key, getListedTermCounts(facetValue, termList));
res.add(key, getTermCounts(facetValue)); } else {
res.add(key, getTermCounts(facetValue));
}
} catch (Exception e) {
String msg = "Exception during facet.field of " + f;
SolrException.logOnce(SolrCore.log, msg, e);
addException(msg , e);
} }
} }
} }
@ -753,155 +779,169 @@ public class SimpleFacets {
* *
* @see FacetParams#FACET_DATE * @see FacetParams#FACET_DATE
*/ */
public NamedList getFacetDateCounts() public NamedList getFacetDateCounts()
throws IOException, ParseException { throws IOException, ParseException {
final NamedList resOuter = new SimpleOrderedMap(); final NamedList resOuter = new SimpleOrderedMap();
final String[] fields = params.getParams(FacetParams.FACET_DATE); final String[] fields = params.getParams(FacetParams.FACET_DATE);
if (null == fields || 0 == fields.length) return resOuter; if (null == fields || 0 == fields.length) return resOuter;
final IndexSchema schema = searcher.getSchema();
for (String f : fields) { for (String f : fields) {
parseParams(FacetParams.FACET_DATE, f); try {
f = facetValue; getFacetDateCounts(f, resOuter);
} catch (Exception e) {
String msg = "Exception during facet.date of " + f;
final NamedList resInner = new SimpleOrderedMap(); SolrException.logOnce(SolrCore.log, msg, e);
resOuter.add(key, resInner); addException(msg , e);
final SchemaField sf = schema.getField(f);
if (! (sf.getType() instanceof DateField)) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
"Can not date facet on a field which is not a DateField: " + f);
} }
final DateField ft = (DateField) sf.getType(); }
final String startS
return resOuter;
}
public void getFacetDateCounts(String dateFacet, NamedList resOuter)
throws IOException, ParseException {
final IndexSchema schema = searcher.getSchema();
parseParams(FacetParams.FACET_DATE, dateFacet);
String f = facetValue;
final NamedList resInner = new SimpleOrderedMap();
resOuter.add(key, resInner);
final SchemaField sf = schema.getField(f);
if (! (sf.getType() instanceof DateField)) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
"Can not date facet on a field which is not a DateField: " + f);
}
final DateField ft = (DateField) sf.getType();
final String startS
= required.getFieldParam(f,FacetParams.FACET_DATE_START); = required.getFieldParam(f,FacetParams.FACET_DATE_START);
final Date start; final Date start;
try { try {
start = ft.parseMath(NOW, startS); start = ft.parseMath(NOW, startS);
} catch (SolrException e) { } catch (SolrException e) {
throw new SolrException throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST, (SolrException.ErrorCode.BAD_REQUEST,
"date facet 'start' is not a valid Date string: " + startS, e); "date facet 'start' is not a valid Date string: " + startS, e);
} }
final String endS final String endS
= required.getFieldParam(f,FacetParams.FACET_DATE_END); = required.getFieldParam(f,FacetParams.FACET_DATE_END);
Date end; // not final, hardend may change this Date end; // not final, hardend may change this
try { try {
end = ft.parseMath(NOW, endS); end = ft.parseMath(NOW, endS);
} catch (SolrException e) { } catch (SolrException e) {
throw new SolrException throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST, (SolrException.ErrorCode.BAD_REQUEST,
"date facet 'end' is not a valid Date string: " + endS, e); "date facet 'end' is not a valid Date string: " + endS, e);
} }
if (end.before(start)) { if (end.before(start)) {
throw new SolrException throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST, (SolrException.ErrorCode.BAD_REQUEST,
"date facet 'end' comes before 'start': "+endS+" < "+startS); "date facet 'end' comes before 'start': "+endS+" < "+startS);
} }
final String gap = required.getFieldParam(f,FacetParams.FACET_DATE_GAP); final String gap = required.getFieldParam(f,FacetParams.FACET_DATE_GAP);
final DateMathParser dmp = new DateMathParser(ft.UTC, Locale.US); final DateMathParser dmp = new DateMathParser(ft.UTC, Locale.US);
dmp.setNow(NOW); dmp.setNow(NOW);
final int minCount = params.getFieldInt(f,FacetParams.FACET_MINCOUNT, 0); final int minCount = params.getFieldInt(f,FacetParams.FACET_MINCOUNT, 0);
final EnumSet<FacetRangeInclude> include = FacetRangeInclude.parseParam final EnumSet<FacetRangeInclude> include = FacetRangeInclude.parseParam
(params.getFieldParams(f,FacetParams.FACET_DATE_INCLUDE)); (params.getFieldParams(f,FacetParams.FACET_DATE_INCLUDE));
try { try {
Date low = start; Date low = start;
while (low.before(end)) { while (low.before(end)) {
dmp.setNow(low); dmp.setNow(low);
String label = ft.toExternal(low); String label = ft.toExternal(low);
Date high = dmp.parseMath(gap); Date high = dmp.parseMath(gap);
if (end.before(high)) { if (end.before(high)) {
if (params.getFieldBool(f,FacetParams.FACET_DATE_HARD_END,false)) { if (params.getFieldBool(f,FacetParams.FACET_DATE_HARD_END,false)) {
high = end; high = end;
} else { } else {
end = high; end = high;
}
} }
if (high.before(low)) { }
throw new SolrException if (high.before(low)) {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST, (SolrException.ErrorCode.BAD_REQUEST,
"date facet infinite loop (is gap negative?)"); "date facet infinite loop (is gap negative?)");
} }
final boolean includeLower = final boolean includeLower =
(include.contains(FacetRangeInclude.LOWER) || (include.contains(FacetRangeInclude.LOWER) ||
(include.contains(FacetRangeInclude.EDGE) && low.equals(start))); (include.contains(FacetRangeInclude.EDGE) && low.equals(start)));
final boolean includeUpper = final boolean includeUpper =
(include.contains(FacetRangeInclude.UPPER) || (include.contains(FacetRangeInclude.UPPER) ||
(include.contains(FacetRangeInclude.EDGE) && high.equals(end))); (include.contains(FacetRangeInclude.EDGE) && high.equals(end)));
final int count = rangeCount(sf,low,high,includeLower,includeUpper); final int count = rangeCount(sf,low,high,includeLower,includeUpper);
if (count >= minCount) { if (count >= minCount) {
resInner.add(label, count); resInner.add(label, count);
}
low = high;
} }
} catch (java.text.ParseException e) { low = high;
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
"date facet 'gap' is not a valid Date Math string: " + gap, e);
} }
} catch (java.text.ParseException e) {
// explicitly return the gap and end so all the counts throw new SolrException
// (including before/after/between) are meaningful - even if mincount (SolrException.ErrorCode.BAD_REQUEST,
// has removed the neighboring ranges "date facet 'gap' is not a valid Date Math string: " + gap, e);
resInner.add("gap", gap); }
resInner.add("start", start);
resInner.add("end", end);
final String[] othersP = // explicitly return the gap and end so all the counts
// (including before/after/between) are meaningful - even if mincount
// has removed the neighboring ranges
resInner.add("gap", gap);
resInner.add("start", start);
resInner.add("end", end);
final String[] othersP =
params.getFieldParams(f,FacetParams.FACET_DATE_OTHER); params.getFieldParams(f,FacetParams.FACET_DATE_OTHER);
if (null != othersP && 0 < othersP.length ) { if (null != othersP && 0 < othersP.length ) {
final Set<FacetRangeOther> others = EnumSet.noneOf(FacetRangeOther.class); final Set<FacetRangeOther> others = EnumSet.noneOf(FacetRangeOther.class);
for (final String o : othersP) { for (final String o : othersP) {
others.add(FacetRangeOther.get(o)); others.add(FacetRangeOther.get(o));
}
// no matter what other values are listed, we don't do
// anything if "none" is specified.
if (! others.contains(FacetRangeOther.NONE) ) {
boolean all = others.contains(FacetRangeOther.ALL);
if (all || others.contains(FacetRangeOther.BEFORE)) {
// include upper bound if "outer" or if first gap doesn't already include it
resInner.add(FacetRangeOther.BEFORE.toString(),
rangeCount(sf,null,start,
false,
(include.contains(FacetRangeInclude.OUTER) ||
(! (include.contains(FacetRangeInclude.LOWER) ||
include.contains(FacetRangeInclude.EDGE))))));
} }
if (all || others.contains(FacetRangeOther.AFTER)) {
// no matter what other values are listed, we don't do // include lower bound if "outer" or if last gap doesn't already include it
// anything if "none" is specified. resInner.add(FacetRangeOther.AFTER.toString(),
if (! others.contains(FacetRangeOther.NONE) ) { rangeCount(sf,end,null,
boolean all = others.contains(FacetRangeOther.ALL); (include.contains(FacetRangeInclude.OUTER) ||
(! (include.contains(FacetRangeInclude.UPPER) ||
if (all || others.contains(FacetRangeOther.BEFORE)) { include.contains(FacetRangeInclude.EDGE)))),
// include upper bound if "outer" or if first gap doesn't already include it false));
resInner.add(FacetRangeOther.BEFORE.toString(), }
rangeCount(sf,null,start, if (all || others.contains(FacetRangeOther.BETWEEN)) {
false, resInner.add(FacetRangeOther.BETWEEN.toString(),
(include.contains(FacetRangeInclude.OUTER) || rangeCount(sf,start,end,
(! (include.contains(FacetRangeInclude.LOWER) || (include.contains(FacetRangeInclude.LOWER) ||
include.contains(FacetRangeInclude.EDGE)))))); include.contains(FacetRangeInclude.EDGE)),
} (include.contains(FacetRangeInclude.UPPER) ||
if (all || others.contains(FacetRangeOther.AFTER)) { include.contains(FacetRangeInclude.EDGE))));
// include lower bound if "outer" or if last gap doesn't already include it
resInner.add(FacetRangeOther.AFTER.toString(),
rangeCount(sf,end,null,
(include.contains(FacetRangeInclude.OUTER) ||
(! (include.contains(FacetRangeInclude.UPPER) ||
include.contains(FacetRangeInclude.EDGE)))),
false));
}
if (all || others.contains(FacetRangeOther.BETWEEN)) {
resInner.add(FacetRangeOther.BETWEEN.toString(),
rangeCount(sf,start,end,
(include.contains(FacetRangeInclude.LOWER) ||
include.contains(FacetRangeInclude.EDGE)),
(include.contains(FacetRangeInclude.UPPER) ||
include.contains(FacetRangeInclude.EDGE))));
}
} }
} }
} }
return resOuter;
} }
@ -912,65 +952,77 @@ public class SimpleFacets {
* *
* @see FacetParams#FACET_RANGE * @see FacetParams#FACET_RANGE
*/ */
public NamedList getFacetRangeCounts()
throws IOException, ParseException { public NamedList getFacetRangeCounts() {
final NamedList resOuter = new SimpleOrderedMap(); final NamedList resOuter = new SimpleOrderedMap();
final String[] fields = params.getParams(FacetParams.FACET_RANGE); final String[] fields = params.getParams(FacetParams.FACET_RANGE);
if (null == fields || 0 == fields.length) return resOuter;
final IndexSchema schema = searcher.getSchema();
for (String f : fields) {
parseParams(FacetParams.FACET_RANGE, f);
f = facetValue;
final SchemaField sf = schema.getField(f);
final FieldType ft = sf.getType();
RangeEndpointCalculator calc = null;
if (ft instanceof TrieField) { if (null == fields || 0 == fields.length) return resOuter;
final TrieField trie = (TrieField)ft;
for (String f : fields) {
switch (trie.getType()) { try {
case FLOAT: getFacetRangeCounts(f, resOuter);
} catch (Exception e) {
String msg = "Exception during facet.range of " + f;
SolrException.logOnce(SolrCore.log, msg, e);
addException(msg , e);
}
}
return resOuter;
}
void getFacetRangeCounts(String facetRange, NamedList resOuter)
throws IOException, ParseException {
final IndexSchema schema = searcher.getSchema();
parseParams(FacetParams.FACET_RANGE, facetRange);
String f = facetValue;
final SchemaField sf = schema.getField(f);
final FieldType ft = sf.getType();
RangeEndpointCalculator calc = null;
if (ft instanceof TrieField) {
final TrieField trie = (TrieField)ft;
switch (trie.getType()) {
case FLOAT:
calc = new FloatRangeEndpointCalculator(sf); calc = new FloatRangeEndpointCalculator(sf);
break; break;
case DOUBLE: case DOUBLE:
calc = new DoubleRangeEndpointCalculator(sf); calc = new DoubleRangeEndpointCalculator(sf);
break; break;
case INTEGER: case INTEGER:
calc = new IntegerRangeEndpointCalculator(sf); calc = new IntegerRangeEndpointCalculator(sf);
break; break;
case LONG: case LONG:
calc = new LongRangeEndpointCalculator(sf); calc = new LongRangeEndpointCalculator(sf);
break; break;
default: default:
throw new SolrException throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST, (SolrException.ErrorCode.BAD_REQUEST,
"Unable to range facet on tried field of unexpected type:" + f); "Unable to range facet on tried field of unexpected type:" + f);
}
} else if (ft instanceof DateField) {
calc = new DateRangeEndpointCalculator(sf, NOW);
} else if (ft instanceof SortableIntField) {
calc = new IntegerRangeEndpointCalculator(sf);
} else if (ft instanceof SortableLongField) {
calc = new LongRangeEndpointCalculator(sf);
} else if (ft instanceof SortableFloatField) {
calc = new FloatRangeEndpointCalculator(sf);
} else if (ft instanceof SortableDoubleField) {
calc = new DoubleRangeEndpointCalculator(sf);
} else {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
"Unable to range facet on field:" + sf);
} }
} else if (ft instanceof DateField) {
resOuter.add(key, getFacetRangeCounts(sf, calc)); calc = new DateRangeEndpointCalculator(sf, NOW);
} else if (ft instanceof SortableIntField) {
calc = new IntegerRangeEndpointCalculator(sf);
} else if (ft instanceof SortableLongField) {
calc = new LongRangeEndpointCalculator(sf);
} else if (ft instanceof SortableFloatField) {
calc = new FloatRangeEndpointCalculator(sf);
} else if (ft instanceof SortableDoubleField) {
calc = new DoubleRangeEndpointCalculator(sf);
} else {
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
"Unable to range facet on field:" + sf);
} }
return resOuter; resOuter.add(key, getFacetRangeCounts(sf, calc));
} }
private <T extends Comparable<T>> NamedList getFacetRangeCounts private <T extends Comparable<T>> NamedList getFacetRangeCounts

12
solr/src/test/org/apache/solr/TestDistributedSearch.java
View File

@ -161,6 +161,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
query("q","*:*", "sort",i1+" desc", "stats", "true", "stats.field", i1); query("q","*:*", "sort",i1+" desc", "stats", "true", "stats.field", i1);
/*** TODO: the failure may come back in "exception"
try { try {
// test error produced for field that is invalid for schema // test error produced for field that is invalid for schema
query("q","*:*", "rows",100, "facet","true", "facet.field",invalidField, "facet.mincount",2); query("q","*:*", "rows",100, "facet","true", "facet.field",invalidField, "facet.mincount",2);
@ -168,6 +169,17 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
} catch (SolrServerException ex) { } catch (SolrServerException ex) {
// expected // expected
} }
***/
// Try to get better coverage for refinement queries by turning off over requesting.
// This makes it much more likely that we may not get the top facet values and hence
// we turn of that checking.
handle.put("facet_fields", SKIPVAL);
query("q","*:*", "rows",0, "facet","true", "facet.field",t1,"facet.limit",5, "facet.shard.limit",5);
// check a complex key name
// query("q","*:*", "rows",0, "facet","true", "facet.field","{!key=a/b/c}"+t1,"facet.limit",5, "facet.shard.limit",5);
handle.remove("facet_fields");
// index the same document to two servers and make sure things // index the same document to two servers and make sure things
// don't blow up. // don't blow up.