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

fix for bug 33161 (UnsupportedOperationException for some combinations of BooleanQuery and MultiPhraseQuery) 

PR: 33161
Submitted by: Rhett Sutphin


git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150733 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Naber 2005-01-19 23:32:52 +00:00
parent ea3a9502f2
commit 7ff11fc34d
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/lucene/search/MultiPhraseQuery.java
View File

@ -225,7 +225,7 @@ public class MultiPhraseQuery extends Query {
} }
} }
protected Weight createWeight(Searcher searcher) { public Query rewrite(IndexReader reader) {
if (termArrays.size() == 1) { // optimize one-term case if (termArrays.size() == 1) { // optimize one-term case
Term[] terms = (Term[])termArrays.get(0); Term[] terms = (Term[])termArrays.get(0);
BooleanQuery boq = new BooleanQuery(); BooleanQuery boq = new BooleanQuery();
@ -233,8 +233,13 @@ public class MultiPhraseQuery extends Query {
boq.add(new TermQuery(terms[i]), BooleanClause.Occur.SHOULD); boq.add(new TermQuery(terms[i]), BooleanClause.Occur.SHOULD);
} }
boq.setBoost(getBoost()); boq.setBoost(getBoost());
return boq.createWeight(searcher); return boq;
} else {
return this;
} }
}
protected Weight createWeight(Searcher searcher) {
return new MultiPhraseWeight(searcher); return new MultiPhraseWeight(searcher);
} }

43
src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
View File

@ -39,13 +39,11 @@ import java.util.LinkedList;
*/ */
public class TestMultiPhraseQuery extends TestCase public class TestMultiPhraseQuery extends TestCase
{ {
public TestMultiPhraseQuery(String name) public TestMultiPhraseQuery(String name) {
{
super(name); super(name);
} }
public void testPhrasePrefix() throws IOException public void testPhrasePrefix() throws IOException {
{
RAMDirectory indexStore = new RAMDirectory(); RAMDirectory indexStore = new RAMDirectory();
IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true); IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true);
add("blueberry pie", writer); add("blueberry pie", writer);
@ -128,10 +126,43 @@ public class TestMultiPhraseQuery extends TestCase
} }
private void add(String s, IndexWriter writer) throws IOException private void add(String s, IndexWriter writer) throws IOException {
{
Document doc = new Document(); Document doc = new Document();
doc.add(new Field("body", s, Field.Store.YES, Field.Index.TOKENIZED)); doc.add(new Field("body", s, Field.Store.YES, Field.Index.TOKENIZED));
writer.addDocument(doc); writer.addDocument(doc);
} }
public void testBooleanQueryContainingSingleTermPrefixQuery() throws IOException {
// this tests against bug 33161 (now fixed)
// In order to cause the bug, the outer query must have more than one term
// and all terms required.
// The contained PhraseMultiQuery must contain exactly one term array.
RAMDirectory indexStore = new RAMDirectory();
IndexWriter writer = new IndexWriter(indexStore, new SimpleAnalyzer(), true);
add("blueberry pie", writer);
add("blueberry chewing gum", writer);
add("blue raspberry pie", writer);
writer.optimize();
writer.close();
IndexSearcher searcher = new IndexSearcher(indexStore);
// This query will be equivalent to +body:pie +body:"blue*"
BooleanQuery q = new BooleanQuery();
q.add(new TermQuery(new Term("body", "pie")), BooleanClause.Occur.MUST);
MultiPhraseQuery trouble = new MultiPhraseQuery();
trouble.add(new Term[] {
new Term("body", "blueberry"),
new Term("body", "blue")
});
q.add(trouble, BooleanClause.Occur.MUST);
// exception will be thrown here without fix
Hits hits = searcher.search(q);
assertEquals("Wrong number of hits", 2, hits.length());
searcher.close();
}
} }