You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2015/11/16 18:47:57 UTC
svn commit: r1714642 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/search/
solr/core/src/java/org/apache/solr/search/facet/
solr/core/src/test/org/apache/solr/search/facet/
Author: yonik
Date: Mon Nov 16 17:47:56 2015
New Revision: 1714642
URL: http://svn.apache.org/viewvc?rev=1714642&view=rev
Log:
SOLR-8284: fix NPE short form sort:index and sort:count
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1714642&r1=1714641&r2=1714642&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Nov 16 17:47:56 2015
@@ -247,6 +247,10 @@ Bug Fixes
* SOLR-8287: TrieDoubleField and TrieLongField now override toNativeType
(Ishan Chattopadhyaya via Christine Poerschke)
+* SOLR-8284: JSON Facet API - fix NPEs when short form "sort:index" or "sort:count"
+ are used. (Michael Sun via yonik)
+
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java?rev=1714642&r1=1714641&r2=1714642&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java Mon Nov 16 17:47:56 2015
@@ -563,6 +563,7 @@ class FacetFieldParser extends FacetPars
facet.sortVariable = sortStr.substring(0, sortStr.length()-" desc".length());
facet.sortDirection = FacetField.SortDirection.desc;
} else {
+ facet.sortVariable = sortStr;
facet.sortDirection = "index".equals(facet.sortVariable) ? FacetField.SortDirection.asc : FacetField.SortDirection.desc; // default direction for "index" is ascending
}
} else {
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java?rev=1714642&r1=1714641&r2=1714642&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java Mon Nov 16 17:47:56 2015
@@ -542,6 +542,22 @@ public class TestJsonFacets extends Solr
"}"
);
+ // test sorting by default count/index order
+ client.testJQ(params(p, "q", "*:*"
+ , "json.facet", "{f1:{terms:{${terms} field:'${cat_s}', sort:'count' } }" +
+ " , f2:{terms:{${terms} field:'${cat_s}', sort:'count asc' } }" +
+ " , f3:{terms:{${terms} field:'${cat_s}', sort:'index' } }" +
+ " , f4:{terms:{${terms} field:'${cat_s}', sort:'index desc' } }" +
+ "}"
+ )
+ , "facets=={ count:6 " +
+ " ,f1:{buckets:[ {val:B,count:3}, {val:A,count:2} ] }" +
+ " ,f2:{buckets:[ {val:A,count:2}, {val:B,count:3} ] }" +
+ " ,f3:{buckets:[ {val:A,count:2}, {val:B,count:3} ] }" +
+ " ,f4:{buckets:[ {val:B,count:3}, {val:A,count:2} ] }" +
+ "}"
+ );
+
// test tiebreaks when sorting by count
client.testJQ(params(p, "q", "id:1 id:6"