You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2013/07/13 20:10:07 UTC
svn commit: r1502831 - in /lucene/dev/branches/lucene_solr_4_4: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/request/SimpleFacets.java
solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
Author: dsmiley
Date: Sat Jul 13 18:10:06 2013
New Revision: 1502831
URL: http://svn.apache.org/r1502831
Log:
SOLR-5034: A facet.query that parses or analyzes down to a null Query would throw a NPE.
Modified:
lucene/dev/branches/lucene_solr_4_4/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_4/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
Modified: lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt?rev=1502831&r1=1502830&r2=1502831&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt Sat Jul 13 18:10:06 2013
@@ -248,6 +248,9 @@ Bug Fixes
using new-style solr.xml, and was not being persisted properly when using
old-style. (Tomás Fernández Löbbe, Ryan Ernst, Alan Woodward)
+* SOLR-5034: A facet.query that parses or analyzes down to a null Query would
+ throw a NPE. Fixed. (David Smiley)
+
Optimizations
----------------------
Modified: lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1502831&r1=1502830&r2=1502831&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Sat Jul 13 18:10:06 2013
@@ -295,7 +295,9 @@ public class SimpleFacets {
// TODO: slight optimization would prevent double-parsing of any localParams
Query qobj = QParser.getParser(q, null, req).getQuery();
- if (params.getBool(GroupParams.GROUP_FACET, false)) {
+ if (qobj == null) {
+ res.add(key, 0);
+ } else if (params.getBool(GroupParams.GROUP_FACET, false)) {
res.add(key, getGroupedFacetQueryCount(qobj));
} else {
res.add(key, searcher.numDocs(qobj, docs));
Modified: lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1502831&r1=1502830&r2=1502831&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java Sat Jul 13 18:10:06 2013
@@ -621,6 +621,13 @@ public class SimpleFacetsTest extends So
)
,"*[count(//lst[@name='zerolen_s']/int)=1]"
);
+
+ assertQ("a facet.query that analyzes to no query shoud not NPE",
+ req("q", "*:*",
+ "facet", "true",
+ "facet.query", "{!field key=k f=lengthfilt}a"),//2 char minimum
+ "//lst[@name='facet_queries']/int[@name='k'][.='0']"
+ );
}
public static void indexDateFacets() {