Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Apache Lucene 9.11.0-snapshot-4be6531 #13850

Merged
merged 1 commit into from
May 28, 2024
Merged

Update to Apache Lucene 9.11.0-snapshot-4be6531 #13850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opensearch = 3.0.0
lucene = 9.11.0-snapshot-fb97840
lucene = 9.11.0-snapshot-4be6531

bundled_jdk_vendor = adoptium
bundled_jdk = 21.0.3+9
Expand Down
1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c2361bd633374ae3814b175cc25ccf773f67026
1 change: 0 additions & 1 deletion libs/core/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8752daf173a642ae02e081cc0398f2ce59278200
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/lucene-expressions-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12630ff9c56e2a372ba57f519c579ff9e728208a
1 change: 0 additions & 1 deletion plugins/analysis-icu/licenses/lucene-analysis-icu-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
752bfc61c7829be6c27d9c1764250196e2c6b06b
1 change: 0 additions & 1 deletion plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5ca56d42b24498a226cf91f48b94e010b6af5fe2
1 change: 0 additions & 1 deletion plugins/analysis-nori/licenses/lucene-analysis-nori-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8eb59a89aa8984457798ccffb8e97e5351bebc1f
1 change: 0 additions & 1 deletion plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
851c1bd99eaef368e84335853dd448e4f56cdbc8
1 change: 0 additions & 1 deletion plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
63647085d41ae231733580c20a498ce7c9134ce5
1 change: 0 additions & 1 deletion plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...s/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a3ba7dd03b1df9efed08eb544689d51d2be22aa5
1 change: 0 additions & 1 deletion ...s/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9cc4e600289bf1171b47de74536bd34c476f85a8
1 change: 0 additions & 1 deletion server/licenses/lucene-analysis-common-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8babfe85be7e36c893741e08072c11e71db09715
1 change: 0 additions & 1 deletion server/licenses/lucene-backward-codecs-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c2361bd633374ae3814b175cc25ccf773f67026
1 change: 0 additions & 1 deletion server/licenses/lucene-core-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9f29b49cd1e0a061ff7fa4a53e8605bd49bd3d0
1 change: 0 additions & 1 deletion server/licenses/lucene-grouping-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
33bc26d46d62bb1cf3bf725db637226a43db7625
1 change: 0 additions & 1 deletion server/licenses/lucene-highlighter-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
82966698abdb8f0367a162f642560566a6085dc8
1 change: 0 additions & 1 deletion server/licenses/lucene-join-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
746f392e7ec27a7cd6ca2add7dd8441d2a6085da
1 change: 0 additions & 1 deletion server/licenses/lucene-memory-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0eb06ecc39c0ec0db380a6e5aad1b16907e0bfd9
1 change: 0 additions & 1 deletion server/licenses/lucene-misc-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0e56eb18cceffcd5ce2e47b679e873420254df74
1 change: 0 additions & 1 deletion server/licenses/lucene-queries-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dee3997a72eeae905e92930f53e724b6bef279da
1 change: 0 additions & 1 deletion server/licenses/lucene-queryparser-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
946bc45b87b3d770ab6828b0d0a5f8684f2c3624
1 change: 0 additions & 1 deletion server/licenses/lucene-sandbox-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d73667f61fb5e7fde4cec52fcfbbfd9847068aec
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial-extras-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a8e8ab80bfb6abd70932e50fe31e13ecf2e00987
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial3d-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-9.11.0-snapshot-4be6531.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
45d6f0facd45d4e49585f0dabfa62ed5a1883033
1 change: 0 additions & 1 deletion server/licenses/lucene-suggest-9.11.0-snapshot-fb97840.jar.sha1
View file
Open in desktop

This file was deleted.

13 changes: 12 additions & 1 deletion server/src/main/java/org/apache/lucene/search/uhighlight/CustomFieldHighlighter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
class CustomFieldHighlighter extends FieldHighlighter {
private static final Passage[] EMPTY_PASSAGE = new Passage[0];

private static final Comparator<Passage> DEFAULT_PASSAGE_SORT_COMPARATOR = Comparator.comparingInt(Passage::getStartOffset);
navneet1v marked this conversation as resolved.
Show resolved Hide resolved

private final Locale breakIteratorLocale;
private final int noMatchSize;
private String fieldValue;
Expand All @@ -66,7 +68,16 @@ class CustomFieldHighlighter extends FieldHighlighter {
PassageFormatter passageFormatter,
int noMatchSize
) {
super(field, fieldOffsetStrategy, breakIterator, passageScorer, maxPassages, maxNoHighlightPassages, passageFormatter);
super(
field,
fieldOffsetStrategy,
breakIterator,
passageScorer,
maxPassages,
maxNoHighlightPassages,
passageFormatter,
DEFAULT_PASSAGE_SORT_COMPARATOR
);
this.breakIteratorLocale = breakIteratorLocale;
this.noMatchSize = noMatchSize;
}
Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/org/opensearch/search/fetch/subphase/highlight/FastVectorHighlighter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ private static BoundaryScanner getBoundaryScanner(Field field) {
return DEFAULT_WORD_BOUNDARY_SCANNER;
case CHARS:
if (fieldOptions.boundaryMaxScan() != SimpleBoundaryScanner.DEFAULT_MAX_SCAN
|| fieldOptions.boundaryChars() != SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS) {
|| fieldOptions.boundaryChars() != HighlightBuilder.DEFAULT_BOUNDARY_CHARS) {
return new SimpleBoundaryScanner(fieldOptions.boundaryMaxScan(), fieldOptions.boundaryChars());
}
return DEFAULT_SIMPLE_BOUNDARY_SCANNER;
Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
/** the default closing tags when {@code tag_schema = "styled"} */
public static final String[] DEFAULT_STYLED_POST_TAGS = { "</em>" };

static final Character[] DEFAULT_BOUNDARY_CHARS = HighlightBuilder.convertCharArray(SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS);

/**
* a {@link FieldOptions} with default settings
*/
Expand All @@ -124,7 +126,7 @@ public class HighlightBuilder extends AbstractHighlighterBuilder<HighlightBuilde
.numberOfFragments(DEFAULT_NUMBER_OF_FRAGMENTS)
.encoder(DEFAULT_ENCODER)
.boundaryMaxScan(SimpleBoundaryScanner.DEFAULT_MAX_SCAN)
.boundaryChars(SimpleBoundaryScanner.DEFAULT_BOUNDARY_CHARS)
.boundaryChars(DEFAULT_BOUNDARY_CHARS)
.boundaryScannerLocale(Locale.ROOT)
.noMatchSize(DEFAULT_NO_MATCH_SIZE)
.phraseLimit(DEFAULT_PHRASE_LIMIT)
Expand Down
Loading