You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2013/02/06 10:10:27 UTC

svn commit: r1442873 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java

Author: jpountz
Date: Wed Feb  6 09:10:27 2013
New Revision: 1442873

URL: http://svn.apache.org/viewvc?rev=1442873&view=rev
Log:
SOLR-2850: Do not refine facets when minCount == 1 (merged from r1442872).

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/FacetComponent.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=1442873&r1=1442872&r2=1442873&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Feb  6 09:10:27 2013
@@ -52,6 +52,9 @@ New Features
 Bug Fixes
 ----------------------
 
+* SOLR-2850: Do not refine facets when minCount == 1
+  (Matt Smith, lundgren via Adrien Grand)
+
 * SOLR-4309: /browse: Improve JQuery autosuggest behavior (janhoy)
 
 * SOLR-4330: group.sort is ignored when using group.truncate and ex/tag

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1442873&r1=1442872&r2=1442873&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java Wed Feb  6 09:10:27 2013
@@ -416,10 +416,10 @@ public class FacetComponent extends Sear
 
     for (DistribFieldFacet dff : fi.facets.values()) {
        // no need to check these facets for refinement
-      if (dff.initialLimit <= 0 && dff.initialMincount == 0) continue;
+      if (dff.initialLimit <= 0 && dff.initialMincount <= 1) continue;
 
       // only other case where index-sort doesn't need refinement is if minCount==0
-      if (dff.minCount == 0 && dff.sort.equals(FacetParams.FACET_SORT_INDEX)) continue;
+      if (dff.minCount <= 1 && dff.sort.equals(FacetParams.FACET_SORT_INDEX)) continue;
 
       @SuppressWarnings("unchecked") // generic array's are annoying
       List<String>[] tmp = (List<String>[]) new List[rb.shards.length];