Bug fix for AnnotatedTextHighlighter #39525
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
markharwood
added
>bug
:Search Relevance/Highlighting
|
Pinging @elastic/es-search |
romseygeek
suggested changes
Mar 1, 2019
There was a problem hiding this comment.
Thanks Mark, I left a couple of comments. I think this would be easier to reason about if we moved the parsing and intersection methods off the Analyzer and into the PassageFormatter and Highlighter - at the moment the Analyzer is doing lots of stuff at different times, and it's quite difficult to follow the paths through the code.
server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/elasticsearch/search/fetch/subphase/highlight/AnnotatedTextHighlighter.java
Outdated
Show resolved
Hide resolved
markharwood
force-pushed
the
fix/6.7_39395
branch
3 times, most recently
from
c40a276 to
9f07b20
Compare
romseygeek
approved these changes
Mar 5, 2019
| @@ -318,45 +319,12 @@ public AnnotationToken getAnnotation(int index) { | |||
| // original markup form in order to inject annotations. | |||
| public static final class AnnotatedHighlighterAnalyzer extends AnalyzerWrapper { | |||
| private Analyzer delegate; | |||
| private AnnotatedText[] annotations; | |||
| public AnnotatedHighlighterAnalyzer(Analyzer delegate){ | |||
| private HitContext hitContext; | |||
markharwood
force-pushed
the
fix/6.7_39395
branch
from
9f07b20 to
e84641c
Compare
Added thread safety by moving custom Analyzer object to per-request context rather than singleton. Added YAML test that reproduced the error. Closes elastic#39395
… into AnnotatedPassageFormatter
markharwood
force-pushed
the
fix/6.7_39395
branch
from
e84641c to
8e58f21
Compare
This was referenced Mar 6, 2019
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Mar 7, 2019
* 6.7: Fix CCR HLRC docs Introduce forget follower API (elastic#39718) 6.6.2 release notes. Update release notes for 6.7.0 Add documentation for min_hash filter (elastic#39671) Unmute testIndividualActionsTimeout Unmute testFollowIndexAndCloseNode Use unwrapped cause to determine if node is closing (elastic#39723) Don’t ack if unable to remove failing replica (elastic#39584) Wipe Snapshots Before Indices in RestTests (elastic#39662) (elastic#39765) Bug fix for AnnotatedTextHighlighter (elastic#39525) Fix Snapshot BwC with Version 5.6.x (elastic#39737) Fix occasional SearchServiceTests failure (elastic#39697) Correct date in daterange-aggregation.asciidoc (elastic#39727) Add a note to purge the ingest-geoip plugin (elastic#39553)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added thread safety to AnnotatedTextHighlighter by moving custom Analyzer object to per-request context rather than singleton.
Added YAML test that reproduced the error.
Closes #39395