Skip to content

Commit 45360db

Browse files
navneet1vnavneet1v
authored
Update to Apache Lucene 9.11.0-snapshot-4be6531 (opensearch-project#13850)
Signed-off-by: Navneet Verma <navneev@amazon.com>
1 parent 994bfae commit 45360db

File tree

50 files changed

+40
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+40
-27
lines changed

‎buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opensearch = 3.0.0
2-
lucene = 9.11.0-snapshot-fb97840
2+
lucene = 9.11.0-snapshot-4be6531
33

44
bundled_jdk_vendor = adoptium
55
bundled_jdk = 21.0.3+9

‎libs/core/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3c2361bd633374ae3814b175cc25ccf773f67026

‎libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8752daf173a642ae02e081cc0398f2ce59278200

‎modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
12630ff9c56e2a372ba57f519c579ff9e728208a

‎plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
752bfc61c7829be6c27d9c1764250196e2c6b06b

‎plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5ca56d42b24498a226cf91f48b94e010b6af5fe2

‎plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8eb59a89aa8984457798ccffb8e97e5351bebc1f

‎plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
851c1bd99eaef368e84335853dd448e4f56cdbc8

‎plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
63647085d41ae231733580c20a498ce7c9134ce5

‎plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a3ba7dd03b1df9efed08eb544689d51d2be22aa5

‎plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-analysis-common-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9cc4e600289bf1171b47de74536bd34c476f85a8

‎server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-backward-codecs-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8babfe85be7e36c893741e08072c11e71db09715

‎server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3c2361bd633374ae3814b175cc25ccf773f67026

‎server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-grouping-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d9f29b49cd1e0a061ff7fa4a53e8605bd49bd3d0

‎server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-highlighter-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
33bc26d46d62bb1cf3bf725db637226a43db7625

‎server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-join-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
82966698abdb8f0367a162f642560566a6085dc8

‎server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-memory-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
746f392e7ec27a7cd6ca2add7dd8441d2a6085da

‎server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-misc-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0eb06ecc39c0ec0db380a6e5aad1b16907e0bfd9

‎server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-queries-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0e56eb18cceffcd5ce2e47b679e873420254df74

‎server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-queryparser-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dee3997a72eeae905e92930f53e724b6bef279da

‎server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-sandbox-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
946bc45b87b3d770ab6828b0d0a5f8684f2c3624

‎server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-spatial-extras-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d73667f61fb5e7fde4cec52fcfbbfd9847068aec

‎server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-spatial3d-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a8e8ab80bfb6abd70932e50fe31e13ecf2e00987

‎server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-suggest-9.11.0-snapshot-4be6531.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
45d6f0facd45d4e49585f0dabfa62ed5a1883033

‎server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1

-1
This file was deleted.

‎server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
class CustomFieldHighlighter extends FieldHighlighter {
5252
private static final Passage[] EMPTY_PASSAGE = new Passage[0];
5353

54+
private static final Comparator<Passage> DEFAULT_PASSAGE_SORT_COMPARATOR = Comparator.comparingInt(Passage::getStartOffset);
55+
5456
private final Locale breakIteratorLocale;
5557
private final int noMatchSize;
5658
private String fieldValue;
@@ -66,7 +68,16 @@ class CustomFieldHighlighter extends FieldHighlighter {
6668
PassageFormatter passageFormatter,
6769
int noMatchSize
6870
) {
69-
super(field, fieldOffsetStrategy, breakIterator, passageScorer, maxPassages, maxNoHighlightPassages, passageFormatter);
71+
super(
72+
field,
73+
fieldOffsetStrategy,
74+
breakIterator,
75+
passageScorer,
76+
maxPassages,
77+
maxNoHighlightPassages,
78+
passageFormatter,
79+
DEFAULT_PASSAGE_SORT_COMPARATOR
80+
);
7081
this.breakIteratorLocale = breakIteratorLocale;
7182
this.noMatchSize = noMatchSize;
7283
}

‎server/src/main/java/org/opensearch/search/fetch/subphase/highlight/FastVectorHighlighter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private static BoundaryScanner getBoundaryScanner(Field field) {
304304
return DEFAULT_WORD_BOUNDARY_SCANNER;
305305
case CHARS:
306306
if (fieldOptions.boundaryMaxScan() != SimpleBoundaryScanner.DEFAULT_MAX_SCAN
307-
|| fieldOptions.boundaryChars() != SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS) {
307+
|| fieldOptions.boundaryChars() != HighlightBuilder.DEFAULT_BOUNDARY_CHARS) {
308308
return new SimpleBoundaryScanner(fieldOptions.boundaryMaxScan(), fieldOptions.boundaryChars());
309309
}
310310
return DEFAULT_SIMPLE_BOUNDARY_SCANNER;

‎server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilder.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
111111
/** the default closing tags when {@code tag_schema = "styled"} */
112112
public static final String[] DEFAULT_STYLED_POST_TAGS = { "</em>" };
113113

114+
static final Character[] DEFAULT_BOUNDARY_CHARS = HighlightBuilder.convertCharArray(SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS);
115+
114116
/**
115117
* a {@link FieldOptions} with default settings
116118
*/
@@ -124,7 +126,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
124126
.numberOfFragments(DEFAULT_NUMBER_OF_FRAGMENTS)
125127
.encoder(DEFAULT_ENCODER)
126128
.boundaryMaxScan(SimpleBoundaryScanner.DEFAULT_MAX_SCAN)
127-
.boundaryChars(SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS)
129+
.boundaryChars(DEFAULT_BOUNDARY_CHARS)
128130
.boundaryScannerLocale(Locale.ROOT)
129131
.noMatchSize(DEFAULT_NO_MATCH_SIZE)
130132
.phraseLimit(DEFAULT_PHRASE_LIMIT)

0 commit comments

Comments
 (0)