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:23:41 UTC
svn commit: r1565108 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
Author: shalin
Date: Thu Feb 6 08:23:40 2014
New Revision: 1565108
URL: http://svn.apache.org/r1565108
Log:
SOLR-5690: Fix NPE in AbstractStatsValues.accumulate with docValues and docs with empty field
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1565108&r1=1565107&r2=1565108&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Feb 6 08:23:40 2014
@@ -64,7 +64,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/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java?rev=1565108&r1=1565107&r2=1565108&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java Thu Feb 6 08:23:40 2014
@@ -496,7 +496,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();
}