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

SOLR-2981: Fixed StatsComponent to no longer return duplicated information when requesting multiple stats.facet fields 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1373598 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2012-08-15 19:44:27 +00:00
parent 769c9003cd
commit 8cb409d4cf
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -66,6 +66,10 @@ Bug Fixes
* SOLR-3730: Rollback is not implemented quite right and can cause corner case fails in * SOLR-3730: Rollback is not implemented quite right and can cause corner case fails in
SolrCloud tests. (rmuir, Mark Miller) SolrCloud tests. (rmuir, Mark Miller)
* SOLR-2981: Fixed StatsComponent to no longer return duplicated information
when requesting multiple stats.facet fields.
(Roman Kliewer via hossman)
Other Changes Other Changes
---------------------- ----------------------

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

@ -182,8 +182,8 @@ abstract class AbstractStatsValues<T> implements StatsValues {
for (Map.Entry<String, StatsValues> e2 : entry.getValue().entrySet()) { for (Map.Entry<String, StatsValues> e2 : entry.getValue().entrySet()) {
nl2.add(e2.getKey(), e2.getValue().getStatsValues()); nl2.add(e2.getKey(), e2.getValue().getStatsValues());
} }
res.add(FACETS, nl);
} }
res.add(FACETS, nl);
return res; return res;
} }

45
solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
View File

@ -228,32 +228,35 @@ public class StatsComponentTest extends AbstractSolrTestCase {
} }
public void doTestFacetStatisticsResult(String f) throws Exception { public void doTestFacetStatisticsResult(String f) throws Exception {
assertU(adoc("id", "1", f, "10", "active_s", "true")); assertU(adoc("id", "1", f, "10", "active_s", "true", "other_s", "foo"));
assertU(adoc("id", "2", f, "20", "active_s", "true")); assertU(adoc("id", "2", f, "20", "active_s", "true", "other_s", "bar"));
assertU(adoc("id", "3", f, "30", "active_s", "false")); assertU(adoc("id", "3", f, "30", "active_s", "false", "other_s", "foo"));
assertU(adoc("id", "4", f, "40", "active_s", "false")); assertU(adoc("id", "4", f, "40", "active_s", "false", "other_s", "foo"));
assertU(commit()); assertU(commit());
assertQ("test value for active_s=true", req("q","*:*", "stats","true", "stats.field",f, "stats.facet","active_s","indent","true") final String pre = "//lst[@name='stats_fields']/lst[@name='"+f+"']/lst[@name='facets']/lst[@name='active_s']";
, "//lst[@name='true']/double[@name='min'][.='10.0']"
, "//lst[@name='true']/double[@name='max'][.='20.0']" assertQ("test value for active_s=true", req("q","*:*", "stats","true", "stats.field",f, "stats.facet","active_s","stats.facet","other_s","indent","true")
, "//lst[@name='true']/double[@name='sum'][.='30.0']" , "*[count("+pre+")=1]"
, "//lst[@name='true']/long[@name='count'][.='2']" , pre+"/lst[@name='true']/double[@name='min'][.='10.0']"
, "//lst[@name='true']/long[@name='missing'][.='0']" , pre+"/lst[@name='true']/double[@name='max'][.='20.0']"
, "//lst[@name='true']/double[@name='sumOfSquares'][.='500.0']" , pre+"/lst[@name='true']/double[@name='sum'][.='30.0']"
, "//lst[@name='true']/double[@name='mean'][.='15.0']" , pre+"/lst[@name='true']/long[@name='count'][.='2']"
, "//lst[@name='true']/double[@name='stddev'][.='7.0710678118654755']" , pre+"/lst[@name='true']/long[@name='missing'][.='0']"
, pre+"/lst[@name='true']/double[@name='sumOfSquares'][.='500.0']"
, pre+"/lst[@name='true']/double[@name='mean'][.='15.0']"
, pre+"/lst[@name='true']/double[@name='stddev'][.='7.0710678118654755']"
); );
assertQ("test value for active_s=false", req("q","*:*", "stats","true", "stats.field",f, "stats.facet","active_s") assertQ("test value for active_s=false", req("q","*:*", "stats","true", "stats.field",f, "stats.facet","active_s")
, "//lst[@name='false']/double[@name='min'][.='30.0']" , pre+"/lst[@name='false']/double[@name='min'][.='30.0']"
, "//lst[@name='false']/double[@name='max'][.='40.0']" , pre+"/lst[@name='false']/double[@name='max'][.='40.0']"
, "//lst[@name='false']/double[@name='sum'][.='70.0']" , pre+"/lst[@name='false']/double[@name='sum'][.='70.0']"
, "//lst[@name='false']/long[@name='count'][.='2']" , pre+"/lst[@name='false']/long[@name='count'][.='2']"
, "//lst[@name='false']/long[@name='missing'][.='0']" , pre+"/lst[@name='false']/long[@name='missing'][.='0']"
, "//lst[@name='false']/double[@name='sumOfSquares'][.='2500.0']" , pre+"/lst[@name='false']/double[@name='sumOfSquares'][.='2500.0']"
, "//lst[@name='false']/double[@name='mean'][.='35.0']" , pre+"/lst[@name='false']/double[@name='mean'][.='35.0']"
, "//lst[@name='false']/double[@name='stddev'][.='7.0710678118654755']" , pre+"/lst[@name='false']/double[@name='stddev'][.='7.0710678118654755']"
); );
} }