You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/04/20 00:07:26 UTC
lucene-solr:branch_6_5: SOLR-10527: edismax with sow=false fails to
create dismax-per-term queries when any field is boosted
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_5 53066d74b -> e126498ce
SOLR-10527: edismax with sow=false fails to create dismax-per-term queries when any field is boosted
Conflicts:
solr/CHANGES.txt
solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e126498c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e126498c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e126498c
Branch: refs/heads/branch_6_5
Commit: e126498cef019f573c111113ba7fa3539abcddce
Parents: 53066d7
Author: Steve Rowe <sa...@gmail.com>
Authored: Wed Apr 19 19:02:32 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Wed Apr 19 20:06:43 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++
.../solr/search/ExtendedDismaxQParser.java | 55 +++++++++++++++++---
.../solr/search/TestExtendedDismaxParser.java | 36 ++++++++++---
3 files changed, 79 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e126498c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 4b06422..108f52f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -51,6 +51,9 @@ Bug Fixes
* SOLR-10439: The new 'large' attribute had been forgotten in /schema/fields?showDefaults=true (David Smiley)
+* SOLR-10527: edismax with sow=false fails to create dismax-per-term queries when any field is boosted.
+ (Steve Rowe)
+
================== 6.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e126498c/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
index 13d4b09..eaf4296 100644
--- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
@@ -1067,7 +1067,7 @@ public class ExtendedDismaxQParser extends QParser {
this.val = null;
this.vals = queryTerms;
this.slop = getPhraseSlop();
- return getAliasedMultiTermQuery(queryTerms);
+ return getAliasedMultiTermQuery();
}
@Override
@@ -1198,11 +1198,11 @@ public class ExtendedDismaxQParser extends QParser {
* DisjunctionMaxQuery. (so yes: aliases which point at other
* aliases should work)
*/
- protected Query getAliasedMultiTermQuery(List<String> queryTerms) throws SyntaxError {
+ protected Query getAliasedMultiTermQuery() throws SyntaxError {
Alias a = aliases.get(field);
this.validateCyclicAliasing(field);
if (a != null) {
- List<Query> lst = getQueries(a);
+ List<Query> lst = getMultiTermQueries(a);
if (lst == null || lst.size() == 0) {
return getQuery();
}
@@ -1213,14 +1213,25 @@ public class ExtendedDismaxQParser extends QParser {
// DisMaxQuery.rewrite() removes itself if there is just a single clause anyway.
// if (lst.size()==1) return lst.get(0);
if (makeDismax) {
- if (lst.get(0) instanceof BooleanQuery && allSameQueryStructure(lst)) {
+ Query firstQuery = lst.get(0);
+ if ((firstQuery instanceof BooleanQuery
+ || (firstQuery instanceof BoostQuery && ((BoostQuery)firstQuery).getQuery() instanceof BooleanQuery))
+ && allSameQueryStructure(lst)) {
BooleanQuery.Builder q = new BooleanQuery.Builder();
List<Query> subs = new ArrayList<>(lst.size());
- for (int c = 0 ; c < ((BooleanQuery)lst.get(0)).clauses().size() ; ++c) {
+ BooleanQuery firstBooleanQuery = firstQuery instanceof BoostQuery
+ ? (BooleanQuery)((BoostQuery)firstQuery).getQuery() : (BooleanQuery)firstQuery;
+ for (int c = 0 ; c < firstBooleanQuery.clauses().size() ; ++c) {
subs.clear();
// Make a dismax query for each clause position in the boolean per-field queries.
for (int n = 0 ; n < lst.size() ; ++n) {
- subs.add(((BooleanQuery)lst.get(n)).clauses().get(c).getQuery());
+ if (lst.get(n) instanceof BoostQuery) {
+ BoostQuery boostQuery = (BoostQuery)lst.get(n);
+ BooleanQuery booleanQuery = (BooleanQuery)boostQuery.getQuery();
+ subs.add(new BoostQuery(booleanQuery.clauses().get(c).getQuery(), boostQuery.getBoost()));
+ } else {
+ subs.add(((BooleanQuery)lst.get(n)).clauses().get(c).getQuery());
+ }
}
q.add(newBooleanClause(new DisjunctionMaxQuery(subs, a.tie), BooleanClause.Occur.SHOULD));
}
@@ -1249,12 +1260,21 @@ public class ExtendedDismaxQParser extends QParser {
}
}
- /** Recursively examines the given query list for identical structure in all queries. */
+ /**
+ * Recursively examines the given query list for identical structure in all queries.
+ * Boosts on BoostQuery-s are ignored, and the contained queries are instead used as the basis for comparison.
+ **/
private boolean allSameQueryStructure(List<Query> lst) {
boolean allSame = true;
Query firstQuery = lst.get(0);
+ if (firstQuery instanceof BoostQuery) {
+ firstQuery = ((BoostQuery)firstQuery).getQuery(); // ignore boost; compare contained query
+ }
for (int n = 1 ; n < lst.size(); ++n) {
Query nthQuery = lst.get(n);
+ if (nthQuery instanceof BoostQuery) {
+ nthQuery = ((BoostQuery)nthQuery).getQuery();
+ }
if (nthQuery.getClass() != firstQuery.getClass()) {
allSame = false;
break;
@@ -1360,7 +1380,26 @@ public class ExtendedDismaxQParser extends QParser {
}
return lst;
}
-
+
+ protected List<Query> getMultiTermQueries(Alias a) throws SyntaxError {
+ if (a == null) return null;
+ if (a.fields.size()==0) return null;
+ List<Query> lst= new ArrayList<>(4);
+
+ for (String f : a.fields.keySet()) {
+ this.field = f;
+ Query sub = getAliasedMultiTermQuery();
+ if (sub != null) {
+ Float boost = a.fields.get(f);
+ if (boost != null && boost.floatValue() != 1f) {
+ sub = new BoostQuery(sub, boost);
+ }
+ lst.add(sub);
+ }
+ }
+ return lst;
+ }
+
private Query getQuery() {
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e126498c/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
index 4a6d453..08caeeb 100644
--- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Random;
import java.util.Set;
+import java.util.stream.Stream;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
@@ -1766,8 +1767,29 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
, "/response/numFound==1"
);
}
-
-
+
+ public void testSowFalseWithBoost() throws Exception {
+ try (SolrQueryRequest req = req("sow", "false", "qf", "text_np title")) {
+ QParser qParser = QParser.getParser("one two", "edismax", req);
+ Query q = qParser.getQuery();
+ assertEquals("+((text_np:on | title:one) (text_np:two | title:two))", q.toString());
+ }
+ try (SolrQueryRequest req = req("sow", "false", "qf", "text_np title^5")) {
+ QParser qParser = QParser.getParser("one two", "edismax", req);
+ Query q = qParser.getQuery();
+ assertEquals("+((text_np:on | (title:one)^5.0) (text_np:two | (title:two)^5.0))", q.toString());
+ }
+ try (SolrQueryRequest req = req("sow", "false", "qf", "text_np^3 title")) {
+ QParser qParser = QParser.getParser("one two", "edismax", req);
+ Query q = qParser.getQuery();
+ assertEquals("+(((text_np:on)^3.0 | title:one) ((text_np:two)^3.0 | title:two))", q.toString());
+ }
+ try (SolrQueryRequest req = req("sow", "false", "qf", "text_np^10 title^20")) {
+ QParser qParser = QParser.getParser("one two", "edismax", req);
+ Query q = qParser.getQuery();
+ assertEquals("+(((text_np:on)^10.0 | (title:one)^20.0) ((text_np:two)^10.0 | (title:two)^20.0))", q.toString());
+ }
+ }
private boolean containsClause(Query query, String field, String value,
int boost, boolean fuzzy) {
@@ -1831,7 +1853,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
return false;
}
- class MultilanguageQueryParser extends ExtendedDismaxQParser {
+ static class MultilanguageQueryParser extends ExtendedDismaxQParser {
public MultilanguageQueryParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) {
@@ -1858,10 +1880,10 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
}
}
-
-
-
- class FuzzyDismaxQParser extends ExtendedDismaxQParser {
+
+
+
+ static class FuzzyDismaxQParser extends ExtendedDismaxQParser {
public FuzzyDismaxQParser(String qstr, SolrParams localParams,
SolrParams params, SolrQueryRequest req) {