You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2014/01/31 17:59:07 UTC
svn commit: r1563176 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java
Author: yonik
Date: Fri Jan 31 16:59:06 2014
New Revision: 1563176
URL: http://svn.apache.org/r1563176
Log:
SOLR-5685: fix FieldFacetAccumulator
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java?rev=1563176&r1=1563175&r2=1563176&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java Fri Jan 31 16:59:06 2014
@@ -117,18 +117,26 @@ public class FieldFacetAccumulator exten
}
} else {
if(numField){
- long v = numValues.get(doc);
- if( v != 0 || numValuesBits.get(doc) ){
- parent.collectField(doc, name, ((NumericParser)parser).parseNum(numValues.get(doc)));
+ if(numValues != null) {
+ long v = numValues.get(doc);
+ if( v != 0 || numValuesBits.get(doc) ){
+ parent.collectField(doc, name, ((NumericParser)parser).parseNum(v));
+ } else {
+ parent.collectField(doc, name, FacetingAccumulator.MISSING_VALUE );
+ }
} else {
parent.collectField(doc, name, FacetingAccumulator.MISSING_VALUE );
}
} else {
- sortValues.get(doc,value);
- if( BytesRef.EMPTY_BYTES == value.bytes ){
- parent.collectField(doc, name, FacetingAccumulator.MISSING_VALUE );
+ if(sortValues != null) {
+ sortValues.get(doc,value);
+ if( BytesRef.EMPTY_BYTES == value.bytes ){
+ parent.collectField(doc, name, FacetingAccumulator.MISSING_VALUE );
+ } else {
+ parent.collectField(doc, name, parser.parse(value) );
+ }
} else {
- parent.collectField(doc, name, parser.parse(value) );
+ parent.collectField(doc, name, FacetingAccumulator.MISSING_VALUE );
}
}
}