Apache Solr open-source search software
SOLR-504: a missing or blank "pf" must not add an empty/no-op boolean clause to the query (#4891)
Eric Pugha0714c8d01d0
diff --git a/changelog/unreleased/SOLR-504-dismax-blank-pf-empty-clause.yml b/changelog/unreleased/SOLR-504-dismax-blank-pf-empty-clause.ymlnew file mode 100644index 00000000000..ebab4b53904--- /dev/null+++ b/changelog/unreleased/SOLR-504-dismax-blank-pf-empty-clause.yml@@ -0,0 +1,9 @@+title: >+ The DisMax query parser no longer adds an empty, no-op boolean clause to the query when the+ pf parameter is blank or missing.+type: fixed+authors:+ - name: Eric Pugh+links:+ - name: SOLR-504+ url: https://issues.apache.org/jira/browse/SOLR-504diff --git a/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.javaindex 25e93592d35..91eec6acabd 100644--- a/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java+++ b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java@@ -227,7 +227,12 @@ public class DisMaxQParser extends QParser {* matched those phrases but do match looser phrases.*/String userPhraseQuery = userQuery.replace("\"", "");- return pp.parse("\"" + userPhraseQuery + "\"");+ Query phrase = pp.parse("\"" + userPhraseQuery + "\"");+ // blank/missing pf yields an empty BooleanQuery, not null; normalize it+ if (ExtendedDismaxQParser.isEmpty(phrase)) {+ return null;+ }+ return phrase;}protected Query getUserQuery(diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.javaindex cf80ef4eb24..f1568b25795 100644--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java@@ -3377,4 +3377,33 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {"org.apache.solr.search.SyntaxError: Query Field 'nosuchfield' is not a valid field name",exception.getMessage());}++ /** SOLR-504: a missing or blank "pf" must not add an empty/no-op boolean clause to the query */+ @Test+ public void testPfMissingOrBlankAddsNoEmptyClause() throws Exception {+ final String expectedNoPf = "+((subject:hello | title:hello) (subject:world | title:world))";+ final String expectedRealPf = expectedNoPf + " (subject:\"hello world\")";++ for (String defType : List.of("dismax", "edismax")) {+ try (SolrQueryRequest req = req("qf", "subject title", "defType", defType)) {+ assertEquals(+ defType,+ expectedNoPf,+ QParser.getParser("hello world", defType, req).getQuery().toString());+ }+ try (SolrQueryRequest req = req("qf", "subject title", "pf", "", "defType", defType)) {+ assertEquals(+ defType,+ expectedNoPf,+ QParser.getParser("hello world", defType, req).getQuery().toString());+ }+ // sanity check: a real pf *does* add a (non-empty) phrase clause+ try (SolrQueryRequest req = req("qf", "subject title", "pf", "subject", "defType", defType)) {+ assertEquals(+ defType,+ expectedRealPf,+ QParser.getParser("hello world", defType, req).getQuery().toString());+ }+ }+ }}