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

SOLR-9237: DefaultSolrHighlighter.doHighlightingByFastVectorHighlighter can't be overidden

This commit is contained in:
Jan Høydahl 2016-06-26 23:59:59 +02:00
parent 46c827e31a
commit 7eb77027bb
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -82,6 +82,8 @@ Bug Fixes
* SOLR-8546: SOLR-8546: TestLazyCores is failing a lot on the Jenkins cluster. (Erick Erickson)
* SOLR-9237: DefaultSolrHighlighter.doHighlightingByFastVectorHighlighter can't be overidden (janhoy)
Optimizations
----------------------

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

@ -389,7 +389,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
preFetchFieldNames.add(keyField.getName());
}
FvhContainer fvhContainer = new FvhContainer(); // Lazy container for fvh and fieldQuery
FvhContainer fvhContainer = new FvhContainer(null, null); // Lazy container for fvh and fieldQuery
IndexReader reader = new TermVectorReusingLeafReader(req.getSearcher().getLeafReader()); // SOLR-5855
@ -422,7 +422,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
return fragments;
}
private Object doHighlightingOfField(Document doc, int docId, SchemaField schemaField,
protected Object doHighlightingOfField(Document doc, int docId, SchemaField schemaField,
FvhContainer fvhContainer, Query query, IndexReader reader, SolrQueryRequest req,
SolrParams params) throws IOException {
Object fieldHighlights;
@ -740,9 +740,14 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf
}
// Wraps FVH to allow pass-by-reference
private class FvhContainer {
private FastVectorHighlighter fvh;
private FieldQuery fieldQuery;
protected class FvhContainer {
FastVectorHighlighter fvh;
FieldQuery fieldQuery;
FvhContainer(FastVectorHighlighter fvh, FieldQuery fieldQuery) {
this.fvh = fvh;
this.fieldQuery = fieldQuery;
}
}
}