Skip to content

Commit aeafa72

Browse files
committed
notices
1 parent e78e85e commit aeafa72

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/XOffsetsFromMatchIterator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.lucene.search.matchhighlight.OffsetRange;
2424
import org.apache.lucene.search.matchhighlight.OffsetsFromPositions;
2525
import org.apache.lucene.search.matchhighlight.OffsetsRetrievalStrategy;
26+
import org.elasticsearch.Version;
2627

2728
import java.io.IOException;
2829
import java.util.ArrayList;
@@ -33,14 +34,15 @@
3334
* This strategy retrieves offsets directly from {@link MatchesIterator}, if they are available,
3435
* otherwise it falls back to using {@link OffsetsFromPositions}.
3536
*/
36-
// https://github.com/apache/lucene/pull/11983
3737
public final class XOffsetsFromMatchIterator implements OffsetsRetrievalStrategy {
3838
private final String field;
3939
private final XOffsetsFromPositions noOffsetsFallback;
4040

4141
XOffsetsFromMatchIterator(String field, XOffsetsFromPositions noOffsetsFallback) {
4242
this.field = field;
4343
this.noOffsetsFallback = Objects.requireNonNull(noOffsetsFallback);
44+
// https://github.com/apache/lucene/pull/11983
45+
assert org.apache.lucene.util.Version.fromBits(9, 5, 0).onOrAfter(Version.CURRENT.luceneVersion) == false;
4446
}
4547

4648
@Override

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/XOffsetsFromPositions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,22 @@
2626
import org.apache.lucene.search.matchhighlight.MatchRegionRetriever;
2727
import org.apache.lucene.search.matchhighlight.OffsetRange;
2828
import org.apache.lucene.search.matchhighlight.OffsetsRetrievalStrategy;
29+
import org.elasticsearch.Version;
2930

3031
import java.io.IOException;
3132
import java.util.ArrayList;
3233
import java.util.Collections;
3334
import java.util.List;
3435

35-
// https://github.com/apache/lucene/pull/11983
3636
public final class XOffsetsFromPositions implements OffsetsRetrievalStrategy {
3737
private final String field;
3838
private final Analyzer analyzer;
3939

4040
public XOffsetsFromPositions(String field, Analyzer analyzer) {
4141
this.field = field;
4242
this.analyzer = analyzer;
43+
// https://github.com/apache/lucene/pull/11983
44+
assert org.apache.lucene.util.Version.fromBits(9, 5, 0).onOrAfter(Version.CURRENT.luceneVersion) == false;
4345
}
4446

4547
@Override

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/XPassageSelector.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.lucene.search.matchhighlight.PassageAdjuster;
2323
import org.apache.lucene.util.ArrayUtil;
2424
import org.apache.lucene.util.PriorityQueue;
25+
import org.elasticsearch.Version;
2526

2627
import java.util.ArrayList;
2728
import java.util.Arrays;
@@ -32,6 +33,7 @@
3233
import java.util.RandomAccess;
3334

3435
public class XPassageSelector {
36+
3537
public static final Comparator<Passage> DEFAULT_SCORER = (a, b) -> {
3638
// Compare the number of highlights first.
3739
int v;
@@ -65,6 +67,8 @@ public XPassageSelector() {
6567
public XPassageSelector(Comparator<Passage> passageScorer, PassageAdjuster passageAdjuster) {
6668
this.passageScorer = passageScorer;
6769
this.passageAdjuster = passageAdjuster;
70+
// https://github.com/apache/lucene/pull/11990
71+
assert org.apache.lucene.util.Version.fromBits(9, 5, 0).onOrAfter(Version.CURRENT.luceneVersion) == false;
6872
}
6973

7074
public List<Passage> pickBest(CharSequence value, List<? extends OffsetRange> markers, int maxPassageWindow, int maxPassages) {

0 commit comments

Comments
 (0)