You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/03 10:51:50 UTC
[02/18] lucene-solr:jira/solr-11702: SOLR-11555: If the query terms
reduce to nothing, filter(clause) produces an NPE whereas fq=clause does not
SOLR-11555: If the query terms reduce to nothing, filter(clause) produces an NPE whereas fq=clause does not
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/05ab5e10
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/05ab5e10
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/05ab5e10
Branch: refs/heads/jira/solr-11702
Commit: 05ab5e10ae2309a307951d753ec0c141b6c12f7d
Parents: 6b368c0
Author: Erick Erickson <er...@apache.org>
Authored: Wed Dec 27 12:05:31 2017 -0800
Committer: Erick Erickson <er...@apache.org>
Committed: Wed Dec 27 12:05:31 2017 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../java/org/apache/solr/query/FilterQuery.java | 5 +++++
.../apache/solr/search/TestSolrQueryParser.java | 20 ++++++++++++++++++++
3 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05ab5e10/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 68003cb..b951d0d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -68,6 +68,9 @@ Bug Fixes
* SOLR-11783: Rename core in solr standalone mode is not persisted (Erick Erickson)
+* SOLR-11555: If the query terms reduce to nothing, filter(clause) produces an NPE whereas
+ fq=clause does not (Erick Erickson)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05ab5e10/solr/core/src/java/org/apache/solr/query/FilterQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/query/FilterQuery.java b/solr/core/src/java/org/apache/solr/query/FilterQuery.java
index 7a74798..02cb88b 100644
--- a/solr/core/src/java/org/apache/solr/query/FilterQuery.java
+++ b/solr/core/src/java/org/apache/solr/query/FilterQuery.java
@@ -22,6 +22,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.BoostQuery;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreMode;
import org.apache.lucene.search.Weight;
@@ -34,6 +35,10 @@ public class FilterQuery extends ExtendedQueryBase {
protected final Query q;
public FilterQuery(Query q) {
+ if (q == null) {
+ this.q = new MatchNoDocsQuery();
+ return;
+ }
this.q = q;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05ab5e10/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index 1cf0a0c..b69fe9e 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@ -491,6 +491,26 @@ public class TestSolrQueryParser extends SolrTestCaseJ4 {
, "/response/docs/[0]/score==10.0"
);
+ assertU(adoc("id", "40", "wdf_nocase", "just some text, don't want NPE"));
+ assertU(commit());
+
+ // See SOLR-11555. If wdff removes all the characters, an NPE occurs.
+ // try q and fq
+ assertJQ(req("q", "filter(wdf_nocase:&)", "fl", "id", "debug", "query")
+ , "/response/numFound==0"
+ );
+ assertJQ(req("fq", "filter(wdf_nocase:.,)", "fl", "id", "debug", "query")
+ , "/response/numFound==0"
+ );
+
+ // Insure the same behavior as with bare clause, just not filter
+ assertJQ(req("q", "wdf_nocase:&", "fl", "id", "debug", "query")
+ , "/response/numFound==0"
+ );
+ assertJQ(req("fq", "wdf_nocase:.,", "fl", "id", "debug", "query")
+ , "/response/numFound==0"
+ );
+
}