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

SOLR-5515: NPE when getting stats on date field with empty result on SolrCloud 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1546725 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2013-11-30 13:04:23 +00:00
parent 484c8e98bb
commit 655a12466f
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -161,7 +161,10 @@ Bug Fixes
a SolrCore does not exist in core discovery mode. (Mark Miller)
* SOLR-5354: Distributed sort is broken with CUSTOM FieldType.
(Steve Rowe, hossman, Robert Muir, Jessica Cheng)
(Steve Rowe, hossman, Robert Muir, Jessica Cheng)
* SOLR-5515: NPE when getting stats on date field with empty result on
SolrCloud. (Alexander Sagen, shalin)
Optimizations
----------------------

7
solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
View File

@ -419,8 +419,11 @@ class DateStatsValues extends AbstractStatsValues<Date> {
*/
@Override
protected void updateTypeSpecificStats(NamedList stv) {
sum += ((Date) stv.get("sum")).getTime();
sumOfSquares += ((Number)stv.get("sumOfSquares")).doubleValue();
Date date = (Date) stv.get("sum");
if (date != null) {
sum += date.getTime();
sumOfSquares += ((Number)stv.get("sumOfSquares")).doubleValue();
}
}
/**

9
solr/core/src/test/org/apache/solr/TestDistributedSearch.java
View File

@ -398,6 +398,15 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
// Thread.sleep(10000000000L);
FieldCache.DEFAULT.purgeAllCaches(); // avoid FC insanity
del("*:*"); // delete all docs and test stats request
commit();
try {
query("q", "*:*", "stats", "true", "stats.field", "stats_dt", "stats.calcdistinct", "true");
} catch (Exception e) {
log.error("Exception on distrib stats request on empty index", e);
fail("NullPointerException with stats request on empty index");
}
}
protected void queryPartialResults(final List<String> upShards,