You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/02/06 09:21:56 UTC

svn commit: r1565106 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java

Author: shalin
Date: Thu Feb  6 08:21:56 2014
New Revision: 1565106

URL: http://svn.apache.org/r1565106
Log:
SOLR-5690: Fix NPE in AbstractStatsValues.accumulate with docValues and docs with empty field

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1565106&r1=1565105&r2=1565106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Feb  6 08:21:56 2014
@@ -100,7 +100,7 @@ New Features
 * SOLR-5208: Support for the setting of core.properties key/values at create-time on 
   Collections API (Erick Erickson)
 
-* SOLR-5428: New 'stats.calcdistinct' parameter in StatsComponent returns
+* SOLR-5428: SOLR-5690: New 'stats.calcdistinct' parameter in StatsComponent returns
   set of distinct values and their count. This can also be specified per field
   e.g. 'f.field.stats.calcdistinct'. (Elran Dvir via shalin)
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java?rev=1565106&r1=1565105&r2=1565106&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java Thu Feb  6 08:21:56 2014
@@ -494,7 +494,11 @@ class StringStatsValues extends Abstract
   @Override
   public void accumulate(int docID) {
     if (values.exists(docID)) {
-      accumulate(values.strVal(docID), 1);
+      String value = values.strVal(docID);
+      if (value != null)
+        accumulate(value, 1);
+      else
+        missing();
     } else {
       missing();
     }