Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4785: Fixed bug with missing boost on toplevel query 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1486898 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jan Høydahl 2013-05-28 12:09:13 +00:00
parent 90dd61de5c
commit d7f397056b
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/core/src/java/org/apache/solr/search/MaxScoreQParser.java
View File

@ -78,6 +78,7 @@ public class MaxScoreQParser extends LuceneQParser {
for(BooleanClause c : prohibOrReq) {
newq.add(c);
}
newq.setBoost(obq.getBoost());
return newq;
}
}

36
solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java
View File

@ -26,6 +26,7 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class TestMaxScoreQueryParser extends AbstractSolrTestCase {
Query q;
@ -41,6 +42,9 @@ public class TestMaxScoreQueryParser extends AbstractSolrTestCase {
q = parse("foo");
assertTrue(q instanceof TermQuery);
q = parse("foo^3.0");
assertTrue(q instanceof TermQuery);
q = parse("price:[0 TO 10]");
assertTrue(q instanceof NumericRangeQuery);
}
@ -92,6 +96,38 @@ public class TestMaxScoreQueryParser extends AbstractSolrTestCase {
assertEquals(0.5, ((DisjunctionMaxQuery) clauses[0].getQuery()).getTieBreakerMultiplier(), 1e-15);
}
@Test
public void testBoost() {
// Simple term query
q = parse("foo^3.0");
assertEquals(3.0, q.getBoost(), 1e-15);
// Some DMQ and one plain required
q = parse("foo^5.0 bar^6.0 +baz^7");
clauses = clauses(q);
assertEquals(2, clauses.length);
assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
DisjunctionMaxQuery dmq = ((DisjunctionMaxQuery) clauses[0].getQuery());
float fooClause = ((BooleanQuery)dmq.getDisjuncts().get(0)).clauses().get(0).getQuery().getBoost();
assertEquals(5.0, fooClause, 1e-15);
float barClause = ((BooleanQuery)dmq.getDisjuncts().get(1)).clauses().get(0).getQuery().getBoost();
assertEquals(6.0, barClause, 1e-15);
assertEquals(7.0, clauses[1].getQuery().getBoost(), 1e-15);
assertEquals(1.0, q.getBoost(), 1e-15);
// Grouped with parens on top level
q = parse("(foo^2.0 bar)^3.0");
clauses = clauses(q);
assertEquals(1, clauses.length);
assertTrue(clauses[0].getQuery() instanceof DisjunctionMaxQuery);
dmq = ((DisjunctionMaxQuery) clauses[0].getQuery());
fooClause = ((BooleanQuery)dmq.getDisjuncts().get(0)).clauses().get(0).getQuery().getBoost();
assertEquals(2.0, fooClause, 1e-15);
barClause = ((BooleanQuery)dmq.getDisjuncts().get(1)).clauses().get(0).getQuery().getBoost();
assertEquals(1.0, barClause, 1e-15);
assertEquals(3.0, q.getBoost(), 1e-15);
}
//
// Helper methods
//