Skip to content

Upgrade to Lucene 10.2.1 #127343

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

Merged
merged 19 commits into from
May 1, 2025
+89 −79
Merged

Upgrade to Lucene 10.2.1 #127343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b130f31
Upgrade to Lucene 10.2.1
ChrisHegarty Apr 24, 2025
809b950
Update docs/changelog/127343.yaml
ChrisHegarty Apr 24, 2025
5a40dfd
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 24, 2025
1df1edb
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 24, 2025
0bec6c4
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 25, 2025
0775abc
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 25, 2025
b16c5a6
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 26, 2025
cfabc88
update to RC2
ChrisHegarty Apr 26, 2025
832db29
update gradle metadata hashes
ChrisHegarty Apr 26, 2025
77dc7f8
fix totalHits expectation in test
ChrisHegarty Apr 28, 2025
bcb3e96
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 28, 2025
0c8d2cf
remove anno
ChrisHegarty Apr 28, 2025
d955c76
more test fixes
ChrisHegarty Apr 28, 2025
9c40ddc
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 28, 2025
9f5bb1c
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 28, 2025
1802ef8
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 29, 2025
c21b2c4
Merge branch 'main' into lucene_10_2_1
ChrisHegarty Apr 29, 2025
47f6575
remove RC maven repo
ChrisHegarty May 1, 2025
2b08fe7
Merge branch 'main' into lucene_10_2_1
ChrisHegarty May 1, 2025
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 build-tools-internal/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
elasticsearch = 9.1.0
lucene = 10.2.1-snapshot-ae6484f43e6
lucene = 10.2.1

bundled_jdk_vendor = openjdk
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90
Expand Down
5 changes: 5 additions & 0 deletions docs/changelog/127343.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 127343
summary: Upgrade to Lucene 10.2.1
area: Search
type: upgrade
issues: []
150 changes: 75 additions & 75 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2951,129 +2951,129 @@
<sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-common" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-common-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="6937376789954a8ba29e92aa7f19f685be4127b866caa304daab064307037ac4" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-common" version="10.2.1">
<artifact name="lucene-analysis-common-10.2.1.jar">
<sha256 value="73e5dfac4c64ea5af6a0e70276c4cf3216085c05de3a6547d4240145bb362a7d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-icu" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-icu-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="366b0138ffa7e5020fd3713ce9d9d109584ab552843b69948c25ef70236db0b3" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-icu" version="10.2.1">
<artifact name="lucene-analysis-icu-10.2.1.jar">
<sha256 value="2f28ed82d0d282d7eb9d3b121106357f28de96acedd6eddddc3c35022284eeea" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-kuromoji-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="26edb5ff3d7ecbc96933bdb19e141c1b943770ebafa3e188f121ad0c4ac180e8" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="10.2.1">
<artifact name="lucene-analysis-kuromoji-10.2.1.jar">
<sha256 value="a5a378a9a93b447aa97239ce5b7ced943e9cfa6f7d21bb0a5266b7215f9242dd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-morfologik-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="346d4413c6869797e6aa7c9dc619dd7178557581cc43f0650297b414ec16cb79" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="10.2.1">
<artifact name="lucene-analysis-morfologik-10.2.1.jar">
<sha256 value="c41f62101f1e2624e8705ec5f43e5c8cb169291b63d4fd4bebda9cd2f278e526" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-nori" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-nori-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="d225d16bc306c630f78d3e93b6a6ca693d82e0cbc9fbd94f3a682f98d09db196" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-nori" version="10.2.1">
<artifact name="lucene-analysis-nori-10.2.1.jar">
<sha256 value="f886af74815f082fff24505dcbc355613014d156af72b0226be819e7e7c05fc6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-phonetic-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="d1b203bae5e13c7e41878fa0cca7dee829b76c262ad172c9a0e9ddfee969a771" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="10.2.1">
<artifact name="lucene-analysis-phonetic-10.2.1.jar">
<sha256 value="be04251434312817fa21b162fc7ddf16d6c9a8647b27f9743e0166f620d26dd9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-smartcn-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="c52c5f820de69992f0c4b34357f9aa338f580c87eb4c37c6005ef64617f0f5c1" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="10.2.1">
<artifact name="lucene-analysis-smartcn-10.2.1.jar">
<sha256 value="fa0955b422e5a3206c9edf6b047fb50a76a16fb54fcc7cc40f8436c77b002ae1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-analysis-stempel-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="5f9552254bce85d20c5e36d7c5a99b7eaa0c199f79b67b27067b0e1ccd589101" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="10.2.1">
<artifact name="lucene-analysis-stempel-10.2.1.jar">
<sha256 value="5afae9ab0bc68b27e7792ca99e8e9ab5f75f9dfe7a5149fd631ad26d321c1034" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-backward-codecs" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-backward-codecs-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="b95dca15b5002700a347006deba1514fea4952454a3678d59c697b5bbfc5ab50" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-backward-codecs" version="10.2.1">
<artifact name="lucene-backward-codecs-10.2.1.jar">
<sha256 value="79be547bd387ddd0e2bb4d7be7756c4fe0b391e78b73bb13c18f71b5227c67f3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-codecs" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-codecs-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="42353bf402867d623a7123be39ff01ee780a1b842be1fa7deb1bce6fa74d8590" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-codecs" version="10.2.1">
<artifact name="lucene-codecs-10.2.1.jar">
<sha256 value="8d823823879ad8920d41034b3a445e5e8a4db8c9f3ad48fec72843bb7548a4d3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-core" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-core-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="e138d97f5f99f4163a04e289546c34a950e5805ce3dbae7c9e2ea6b80e200bb9" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-core" version="10.2.1">
<artifact name="lucene-core-10.2.1.jar">
<sha256 value="245395b58fc290c0630a0e2196afcf331bac4c74d80529d14b7b2553a8543bfd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-expressions" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-expressions-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="a76d416f1fb95b104051071adec4f68b62d1d38ed1b9b9f41f5179538cb2117c" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-expressions" version="10.2.1">
<artifact name="lucene-expressions-10.2.1.jar">
<sha256 value="1e60954153a0ff108ca7f6bbeb2dc0e41dab99a40e938657036eec341d9e27bc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-facet" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-facet-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="8da50cde7e28c219c12ff0ca0ad79d70366d460e653b635f26d70864c6bfb72b" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-facet" version="10.2.1">
<artifact name="lucene-facet-10.2.1.jar">
<sha256 value="24bca0ba77b7283a67caae3260e286b629b0782f8f3e392934a419b2f7e8e460" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-grouping" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-grouping-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="e32f0055672b48c0b8a8386f0e1c7e3f52644799e0ac028df09e6f76e2c1bee5" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-grouping" version="10.2.1">
<artifact name="lucene-grouping-10.2.1.jar">
<sha256 value="42667281086556cf94d42086ca3b540d23022cca583c14462e401f1d4fa31d2e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-highlighter" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-highlighter-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="d98cb5700706dbd29121157bd1addf8f98457566029d576e98f9d8f52765aba8" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-highlighter" version="10.2.1">
<artifact name="lucene-highlighter-10.2.1.jar">
<sha256 value="8f1f8228944b269c7a7eb4fe24cad67c4391a2b50a82c14ade5e8d0ad609fa8b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-join" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-join-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="d37fa3dc38e8ddd641fd94f65f7a3ab06911674b1755f0612027f34c30039eeb" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-join" version="10.2.1">
<artifact name="lucene-join-10.2.1.jar">
<sha256 value="6c27781629f5e435a58521be3a1e8369a7300080196ea3c2e094299913b5e853" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-memory" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-memory-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="5a4a2519b066cd12ee6b99327eb86ddc44efb90081146501beb3b98c7810efae" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-memory" version="10.2.1">
<artifact name="lucene-memory-10.2.1.jar">
<sha256 value="7f6b0e99cb650c4bb6a0eeb05f0799a8f039ab07921ed7b4fdd031a3e560460f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-misc" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-misc-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="54a087d5d1ba529c13d77a045bf9870ddfec78d4a056cafa376eba3593807b09" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-misc" version="10.2.1">
<artifact name="lucene-misc-10.2.1.jar">
<sha256 value="c727b429d5a8612572e5180a203580a13feadfeea0a109da943436cc8da1cc55" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-queries" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-queries-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="ba91caf5e0ebe1fdb598c5fac6a22d3ab8e909d4a5fe2156a5f7d2f3d37aaed3" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-queries" version="10.2.1">
<artifact name="lucene-queries-10.2.1.jar">
<sha256 value="0aff0eaa0f11f03c3dccd4f1e97db454794dd914946fe5d0669c3794673bfed0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-queryparser" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-queryparser-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="c818fc0a8a4f7c89c8a4da68d09fc51519f71ef5fe126dea25e49d92f7ef3d5d" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-queryparser" version="10.2.1">
<artifact name="lucene-queryparser-10.2.1.jar">
<sha256 value="9f394d20f8420608e104b7a645f6b76c22ceb0b655476a9365a5746f3a2272be" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-sandbox" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-sandbox-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="92a7a3754250c37bd63aa3192706ae4c836fcb3a298596293b9d9964206d4ebe" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-sandbox" version="10.2.1">
<artifact name="lucene-sandbox-10.2.1.jar">
<sha256 value="b8feeb751e66694ea3b0e9e6df6340749b92127c281c8e6be5a408bcd710da04" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-spatial-extras" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-spatial-extras-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="ec61f33001af50a4244407ed4c06546c2d567b87c0e5f8a1076404972ed0355b" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-spatial-extras" version="10.2.1">
<artifact name="lucene-spatial-extras-10.2.1.jar">
<sha256 value="8c7ff3f251c765872e07fb2c2b6b8eb28d87bb5b34ba33fad5516b4d3b52dd5d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-spatial3d" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-spatial3d-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="d7ef6ec7ec2c7111f41f494176ba82d9800afb46e1c129f5df175b3312c22f2a" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-spatial3d" version="10.2.1">
<artifact name="lucene-spatial3d-10.2.1.jar">
<sha256 value="70147dcbed711961bc18ada6ff957ff853a7d2d50496f7754d80041bf0d96eb4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-suggest" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-suggest-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="834e34badfa0af72604641a1ac52c29f6bfc2d83e35006837ba752604f125b96" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-suggest" version="10.2.1">
<artifact name="lucene-suggest-10.2.1.jar">
<sha256 value="879e00b16f0c2ba13307784b5e1c35e5d6c6671a419f0f9140d3f595c1d6ef80" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.lucene" name="lucene-test-framework" version="10.2.1-snapshot-ae6484f43e6">
<artifact name="lucene-test-framework-10.2.1-snapshot-ae6484f43e6.jar">
<sha256 value="a7be31ba894f41ec43a51401b8094b1ea96a848362c9de494d2d5382a2aafc71" origin="Generated by Gradle"/>
<component group="org.apache.lucene" name="lucene-test-framework" version="10.2.1">
<artifact name="lucene-test-framework-10.2.1.jar">
<sha256 value="0c1dfd96bc2b505e221de7b58c954aa04803e7004de390189a7db6ab5cf91eac" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">
Expand Down
11 changes: 8 additions & 3 deletions server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TotalHits;
import org.apache.lucene.search.TotalHits.Relation;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.ScoreMode;
Expand Down Expand Up @@ -567,12 +568,13 @@ public void testTerminateAfterWithHitsNoHitCountShortcut() throws Exception {
// size is lower than terminate_after
context.setSize(5);
// track_total_hits is lower than terminate_after
context.trackTotalHitsUpTo(randomIntBetween(1, 6));
int trackTotalHits = randomIntBetween(1, 6);
context.trackTotalHitsUpTo(trackTotalHits);
QueryPhase.executeQuery(context);
// depending on docs distribution we may or may not be able to honor terminate_after: low scoring hits are skipped via
// setMinCompetitiveScore, which bypasses terminate_after until the next leaf collector is pulled, when that happens.
assertThat(context.queryResult().terminatedEarly(), either(is(true)).or(is(false)));
assertThat(context.queryResult().topDocs().topDocs.totalHits.value(), equalTo(7L));
assertThat(context.queryResult().topDocs().topDocs.totalHits.value(), greaterThanOrEqualTo((long) trackTotalHits));
assertThat(context.queryResult().topDocs().topDocs.totalHits.relation(), equalTo(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO));
assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(5));
}
Expand Down Expand Up @@ -990,7 +992,10 @@ public void testMinScore() throws Exception {
context.trackTotalHitsUpTo(5);

QueryPhase.addCollectorsAndSearch(context);
assertEquals(10, context.queryResult().topDocs().topDocs.totalHits.value());
TotalHits totalHits = context.queryResult().topDocs().topDocs.totalHits;
assertThat(totalHits.value(), greaterThanOrEqualTo(5L));
var expectedRelation = totalHits.value() == 10 ? Relation.EQUAL_TO : Relation.GREATER_THAN_OR_EQUAL_TO;
assertThat(totalHits.relation(), is(expectedRelation));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test updated as per apache/lucene#14561

}
}

Expand Down
Loading