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

LUCENE-1889: pass the reader to FVH so it can rewrite multitermqueries 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1167008 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2011-09-09 05:46:21 +00:00
parent 9e15eeaa86
commit 20c03511c8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java
View File

@ -77,6 +77,8 @@ public class FastVectorHighlighter {
* @return the created {@link FieldQuery} object * @return the created {@link FieldQuery} object
*/ */
public FieldQuery getFieldQuery( Query query ) { public FieldQuery getFieldQuery( Query query ) {
// TODO: should we deprecate this?
// because if there is no reader, then we cannot rewrite MTQ.
try { try {
return new FieldQuery( query, null, phraseHighlight, fieldMatch ); return new FieldQuery( query, null, phraseHighlight, fieldMatch );
} catch (IOException e) { } catch (IOException e) {

2
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
View File

@ -102,7 +102,7 @@ public class FieldQuery {
if( !flatQueries.contains( sourceQuery ) ) if( !flatQueries.contains( sourceQuery ) )
flatQueries.add( sourceQuery ); flatQueries.add( sourceQuery );
} }
else if (sourceQuery instanceof MultiTermQuery) { else if (sourceQuery instanceof MultiTermQuery && reader != null) {
MultiTermQuery copy = (MultiTermQuery) sourceQuery.clone(); MultiTermQuery copy = (MultiTermQuery) sourceQuery.clone();
copy.setRewriteMethod(new MultiTermQuery.TopTermsScoringBooleanQueryRewrite(MAX_MTQ_TERMS)); copy.setRewriteMethod(new MultiTermQuery.TopTermsScoringBooleanQueryRewrite(MAX_MTQ_TERMS));
BooleanQuery mtqTerms = (BooleanQuery) copy.rewrite(reader); BooleanQuery mtqTerms = (BooleanQuery) copy.rewrite(reader);

2
solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
View File

@ -364,7 +364,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
// FVH cannot process hl.requireFieldMatch parameter per-field basis // FVH cannot process hl.requireFieldMatch parameter per-field basis
params.getBool( HighlightParams.FIELD_MATCH, false ) ); params.getBool( HighlightParams.FIELD_MATCH, false ) );
fvh.setPhraseLimit(params.getInt(HighlightParams.PHRASE_LIMIT, Integer.MAX_VALUE)); fvh.setPhraseLimit(params.getInt(HighlightParams.PHRASE_LIMIT, Integer.MAX_VALUE));
FieldQuery fieldQuery = fvh.getFieldQuery( query ); FieldQuery fieldQuery = fvh.getFieldQuery( query, searcher.getIndexReader() );
// Highlight each document // Highlight each document
DocIterator iterator = docs.iterator(); DocIterator iterator = docs.iterator();