-
Notifications
You must be signed in to change notification settings - Fork 25k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Correct offsets in FVH also if stored field is used for highlighting
The SimpleFragemntsBuilder did not correct offsets if the used analysis chais could produce broken offsets that could lead to StringArrayIndexOutOfBounds Exceptions Closes #3140
- Loading branch information
Showing
4 changed files
with
141 additions
and
77 deletions.
There are no files selected for viewing
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
45 changes: 45 additions & 0 deletions
45
src/main/java/org/elasticsearch/search/highlight/vectorhighlight/SimpleFragmentsBuilder.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Licensed to Elastic Search and Shay Banon under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Elastic Search licenses this | ||
| * file to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.search.highlight.vectorhighlight; | ||
|
|
||
| import org.apache.lucene.document.Field; | ||
| import org.apache.lucene.search.highlight.Encoder; | ||
| import org.apache.lucene.search.vectorhighlight.BoundaryScanner; | ||
| import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo; | ||
| import org.elasticsearch.index.mapper.FieldMapper; | ||
|
|
||
| /** | ||
| * Direct Subclass of Lucene's org.apache.lucene.search.vectorhighlight.SimpleFragmentsBuilder | ||
| * that corrects offsets for broken analysis chains. | ||
| */ | ||
| public class SimpleFragmentsBuilder extends org.apache.lucene.search.vectorhighlight.SimpleFragmentsBuilder { | ||
| protected final FieldMapper<?> mapper; | ||
|
|
||
| public SimpleFragmentsBuilder(FieldMapper<?> mapper, | ||
| String[] preTags, String[] postTags, BoundaryScanner boundaryScanner) { | ||
| super(preTags, postTags, boundaryScanner); | ||
| this.mapper = mapper; | ||
| } | ||
|
|
||
| @Override | ||
| protected String makeFragment( StringBuilder buffer, int[] index, Field[] values, WeightedFragInfo fragInfo, | ||
| String[] preTags, String[] postTags, Encoder encoder ){ | ||
| return super.makeFragment(buffer, index, values, FragmentBuilderHelper.fixWeightedFragInfo(mapper, values, fragInfo), preTags, postTags, encoder); | ||
| } | ||
| } |
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
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