Skip to content

Commit 898dd47

Browse files
ChrisHegartyChrisHegarty
authored
Upgrade to Lucene 10.2.1 (elastic#127343)
This commit upgrades to Lucene 10.2.1 (from a previous 10.2.1-SNAPSHOT). Given that we're on a snapshot, there are a few things to note: * No index version update is necessary, we already have IndexVersions.UPGRADE_TO_LUCENE_10_2_1, and there are no format changes in the final non-snapshot release.
1 parent 1af1f02 commit 898dd47

File tree

4 files changed

+89
-79
lines changed

4 files changed

+89
-79
lines changed

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 9.1.0
2-
lucene = 10.2.1-snapshot-ae6484f43e6
2+
lucene = 10.2.1
33

44
bundled_jdk_vendor = openjdk
55
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90

‎docs/changelog/127343.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127343
2+
summary: Upgrade to Lucene 10.2.1
3+
area: Search
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2951,129 +2951,129 @@
29512951
<sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
29522952
</artifact>
29532953
</component>
2954-
<component group="org.apache.lucene" name="lucene-analysis-common" version="10.2.1-snapshot-ae6484f43e6">
2955-
<artifact name="lucene-analysis-common-10.2.1-snapshot-ae6484f43e6.jar">
2956-
<sha256 value="6937376789954a8ba29e92aa7f19f685be4127b866caa304daab064307037ac4" origin="Generated by Gradle"/>
2954+
<component group="org.apache.lucene" name="lucene-analysis-common" version="10.2.1">
2955+
<artifact name="lucene-analysis-common-10.2.1.jar">
2956+
<sha256 value="73e5dfac4c64ea5af6a0e70276c4cf3216085c05de3a6547d4240145bb362a7d" origin="Generated by Gradle"/>
29572957
</artifact>
29582958
</component>
2959-
<component group="org.apache.lucene" name="lucene-analysis-icu" version="10.2.1-snapshot-ae6484f43e6">
2960-
<artifact name="lucene-analysis-icu-10.2.1-snapshot-ae6484f43e6.jar">
2961-
<sha256 value="366b0138ffa7e5020fd3713ce9d9d109584ab552843b69948c25ef70236db0b3" origin="Generated by Gradle"/>
2959+
<component group="org.apache.lucene" name="lucene-analysis-icu" version="10.2.1">
2960+
<artifact name="lucene-analysis-icu-10.2.1.jar">
2961+
<sha256 value="2f28ed82d0d282d7eb9d3b121106357f28de96acedd6eddddc3c35022284eeea" origin="Generated by Gradle"/>
29622962
</artifact>
29632963
</component>
2964-
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="10.2.1-snapshot-ae6484f43e6">
2965-
<artifact name="lucene-analysis-kuromoji-10.2.1-snapshot-ae6484f43e6.jar">
2966-
<sha256 value="26edb5ff3d7ecbc96933bdb19e141c1b943770ebafa3e188f121ad0c4ac180e8" origin="Generated by Gradle"/>
2964+
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="10.2.1">
2965+
<artifact name="lucene-analysis-kuromoji-10.2.1.jar">
2966+
<sha256 value="a5a378a9a93b447aa97239ce5b7ced943e9cfa6f7d21bb0a5266b7215f9242dd" origin="Generated by Gradle"/>
29672967
</artifact>
29682968
</component>
2969-
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="10.2.1-snapshot-ae6484f43e6">
2970-
<artifact name="lucene-analysis-morfologik-10.2.1-snapshot-ae6484f43e6.jar">
2971-
<sha256 value="346d4413c6869797e6aa7c9dc619dd7178557581cc43f0650297b414ec16cb79" origin="Generated by Gradle"/>
2969+
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="10.2.1">
2970+
<artifact name="lucene-analysis-morfologik-10.2.1.jar">
2971+
<sha256 value="c41f62101f1e2624e8705ec5f43e5c8cb169291b63d4fd4bebda9cd2f278e526" origin="Generated by Gradle"/>
29722972
</artifact>
29732973
</component>
2974-
<component group="org.apache.lucene" name="lucene-analysis-nori" version="10.2.1-snapshot-ae6484f43e6">
2975-
<artifact name="lucene-analysis-nori-10.2.1-snapshot-ae6484f43e6.jar">
2976-
<sha256 value="d225d16bc306c630f78d3e93b6a6ca693d82e0cbc9fbd94f3a682f98d09db196" origin="Generated by Gradle"/>
2974+
<component group="org.apache.lucene" name="lucene-analysis-nori" version="10.2.1">
2975+
<artifact name="lucene-analysis-nori-10.2.1.jar">
2976+
<sha256 value="f886af74815f082fff24505dcbc355613014d156af72b0226be819e7e7c05fc6" origin="Generated by Gradle"/>
29772977
</artifact>
29782978
</component>
2979-
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="10.2.1-snapshot-ae6484f43e6">
2980-
<artifact name="lucene-analysis-phonetic-10.2.1-snapshot-ae6484f43e6.jar">
2981-
<sha256 value="d1b203bae5e13c7e41878fa0cca7dee829b76c262ad172c9a0e9ddfee969a771" origin="Generated by Gradle"/>
2979+
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="10.2.1">
2980+
<artifact name="lucene-analysis-phonetic-10.2.1.jar">
2981+
<sha256 value="be04251434312817fa21b162fc7ddf16d6c9a8647b27f9743e0166f620d26dd9" origin="Generated by Gradle"/>
29822982
</artifact>
29832983
</component>
2984-
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="10.2.1-snapshot-ae6484f43e6">
2985-
<artifact name="lucene-analysis-smartcn-10.2.1-snapshot-ae6484f43e6.jar">
2986-
<sha256 value="c52c5f820de69992f0c4b34357f9aa338f580c87eb4c37c6005ef64617f0f5c1" origin="Generated by Gradle"/>
2984+
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="10.2.1">
2985+
<artifact name="lucene-analysis-smartcn-10.2.1.jar">
2986+
<sha256 value="fa0955b422e5a3206c9edf6b047fb50a76a16fb54fcc7cc40f8436c77b002ae1" origin="Generated by Gradle"/>
29872987
</artifact>
29882988
</component>
2989-
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="10.2.1-snapshot-ae6484f43e6">
2990-
<artifact name="lucene-analysis-stempel-10.2.1-snapshot-ae6484f43e6.jar">
2991-
<sha256 value="5f9552254bce85d20c5e36d7c5a99b7eaa0c199f79b67b27067b0e1ccd589101" origin="Generated by Gradle"/>
2989+
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="10.2.1">
2990+
<artifact name="lucene-analysis-stempel-10.2.1.jar">
2991+
<sha256 value="5afae9ab0bc68b27e7792ca99e8e9ab5f75f9dfe7a5149fd631ad26d321c1034" origin="Generated by Gradle"/>
29922992
</artifact>
29932993
</component>
2994-
<component group="org.apache.lucene" name="lucene-backward-codecs" version="10.2.1-snapshot-ae6484f43e6">
2995-
<artifact name="lucene-backward-codecs-10.2.1-snapshot-ae6484f43e6.jar">
2996-
<sha256 value="b95dca15b5002700a347006deba1514fea4952454a3678d59c697b5bbfc5ab50" origin="Generated by Gradle"/>
2994+
<component group="org.apache.lucene" name="lucene-backward-codecs" version="10.2.1">
2995+
<artifact name="lucene-backward-codecs-10.2.1.jar">
2996+
<sha256 value="79be547bd387ddd0e2bb4d7be7756c4fe0b391e78b73bb13c18f71b5227c67f3" origin="Generated by Gradle"/>
29972997
</artifact>
29982998
</component>
2999-
<component group="org.apache.lucene" name="lucene-codecs" version="10.2.1-snapshot-ae6484f43e6">
3000-
<artifact name="lucene-codecs-10.2.1-snapshot-ae6484f43e6.jar">
3001-
<sha256 value="42353bf402867d623a7123be39ff01ee780a1b842be1fa7deb1bce6fa74d8590" origin="Generated by Gradle"/>
2999+
<component group="org.apache.lucene" name="lucene-codecs" version="10.2.1">
3000+
<artifact name="lucene-codecs-10.2.1.jar">
3001+
<sha256 value="8d823823879ad8920d41034b3a445e5e8a4db8c9f3ad48fec72843bb7548a4d3" origin="Generated by Gradle"/>
30023002
</artifact>
30033003
</component>
3004-
<component group="org.apache.lucene" name="lucene-core" version="10.2.1-snapshot-ae6484f43e6">
3005-
<artifact name="lucene-core-10.2.1-snapshot-ae6484f43e6.jar">
3006-
<sha256 value="e138d97f5f99f4163a04e289546c34a950e5805ce3dbae7c9e2ea6b80e200bb9" origin="Generated by Gradle"/>
3004+
<component group="org.apache.lucene" name="lucene-core" version="10.2.1">
3005+
<artifact name="lucene-core-10.2.1.jar">
3006+
<sha256 value="245395b58fc290c0630a0e2196afcf331bac4c74d80529d14b7b2553a8543bfd" origin="Generated by Gradle"/>
30073007
</artifact>
30083008
</component>
3009-
<component group="org.apache.lucene" name="lucene-expressions" version="10.2.1-snapshot-ae6484f43e6">
3010-
<artifact name="lucene-expressions-10.2.1-snapshot-ae6484f43e6.jar">
3011-
<sha256 value="a76d416f1fb95b104051071adec4f68b62d1d38ed1b9b9f41f5179538cb2117c" origin="Generated by Gradle"/>
3009+
<component group="org.apache.lucene" name="lucene-expressions" version="10.2.1">
3010+
<artifact name="lucene-expressions-10.2.1.jar">
3011+
<sha256 value="1e60954153a0ff108ca7f6bbeb2dc0e41dab99a40e938657036eec341d9e27bc" origin="Generated by Gradle"/>
30123012
</artifact>
30133013
</component>
3014-
<component group="org.apache.lucene" name="lucene-facet" version="10.2.1-snapshot-ae6484f43e6">
3015-
<artifact name="lucene-facet-10.2.1-snapshot-ae6484f43e6.jar">
3016-
<sha256 value="8da50cde7e28c219c12ff0ca0ad79d70366d460e653b635f26d70864c6bfb72b" origin="Generated by Gradle"/>
3014+
<component group="org.apache.lucene" name="lucene-facet" version="10.2.1">
3015+
<artifact name="lucene-facet-10.2.1.jar">
3016+
<sha256 value="24bca0ba77b7283a67caae3260e286b629b0782f8f3e392934a419b2f7e8e460" origin="Generated by Gradle"/>
30173017
</artifact>
30183018
</component>
3019-
<component group="org.apache.lucene" name="lucene-grouping" version="10.2.1-snapshot-ae6484f43e6">
3020-
<artifact name="lucene-grouping-10.2.1-snapshot-ae6484f43e6.jar">
3021-
<sha256 value="e32f0055672b48c0b8a8386f0e1c7e3f52644799e0ac028df09e6f76e2c1bee5" origin="Generated by Gradle"/>
3019+
<component group="org.apache.lucene" name="lucene-grouping" version="10.2.1">
3020+
<artifact name="lucene-grouping-10.2.1.jar">
3021+
<sha256 value="42667281086556cf94d42086ca3b540d23022cca583c14462e401f1d4fa31d2e" origin="Generated by Gradle"/>
30223022
</artifact>
30233023
</component>
3024-
<component group="org.apache.lucene" name="lucene-highlighter" version="10.2.1-snapshot-ae6484f43e6">
3025-
<artifact name="lucene-highlighter-10.2.1-snapshot-ae6484f43e6.jar">
3026-
<sha256 value="d98cb5700706dbd29121157bd1addf8f98457566029d576e98f9d8f52765aba8" origin="Generated by Gradle"/>
3024+
<component group="org.apache.lucene" name="lucene-highlighter" version="10.2.1">
3025+
<artifact name="lucene-highlighter-10.2.1.jar">
3026+
<sha256 value="8f1f8228944b269c7a7eb4fe24cad67c4391a2b50a82c14ade5e8d0ad609fa8b" origin="Generated by Gradle"/>
30273027
</artifact>
30283028
</component>
3029-
<component group="org.apache.lucene" name="lucene-join" version="10.2.1-snapshot-ae6484f43e6">
3030-
<artifact name="lucene-join-10.2.1-snapshot-ae6484f43e6.jar">
3031-
<sha256 value="d37fa3dc38e8ddd641fd94f65f7a3ab06911674b1755f0612027f34c30039eeb" origin="Generated by Gradle"/>
3029+
<component group="org.apache.lucene" name="lucene-join" version="10.2.1">
3030+
<artifact name="lucene-join-10.2.1.jar">
3031+
<sha256 value="6c27781629f5e435a58521be3a1e8369a7300080196ea3c2e094299913b5e853" origin="Generated by Gradle"/>
30323032
</artifact>
30333033
</component>
3034-
<component group="org.apache.lucene" name="lucene-memory" version="10.2.1-snapshot-ae6484f43e6">
3035-
<artifact name="lucene-memory-10.2.1-snapshot-ae6484f43e6.jar">
3036-
<sha256 value="5a4a2519b066cd12ee6b99327eb86ddc44efb90081146501beb3b98c7810efae" origin="Generated by Gradle"/>
3034+
<component group="org.apache.lucene" name="lucene-memory" version="10.2.1">
3035+
<artifact name="lucene-memory-10.2.1.jar">
3036+
<sha256 value="7f6b0e99cb650c4bb6a0eeb05f0799a8f039ab07921ed7b4fdd031a3e560460f" origin="Generated by Gradle"/>
30373037
</artifact>
30383038
</component>
3039-
<component group="org.apache.lucene" name="lucene-misc" version="10.2.1-snapshot-ae6484f43e6">
3040-
<artifact name="lucene-misc-10.2.1-snapshot-ae6484f43e6.jar">
3041-
<sha256 value="54a087d5d1ba529c13d77a045bf9870ddfec78d4a056cafa376eba3593807b09" origin="Generated by Gradle"/>
3039+
<component group="org.apache.lucene" name="lucene-misc" version="10.2.1">
3040+
<artifact name="lucene-misc-10.2.1.jar">
3041+
<sha256 value="c727b429d5a8612572e5180a203580a13feadfeea0a109da943436cc8da1cc55" origin="Generated by Gradle"/>
30423042
</artifact>
30433043
</component>
3044-
<component group="org.apache.lucene" name="lucene-queries" version="10.2.1-snapshot-ae6484f43e6">
3045-
<artifact name="lucene-queries-10.2.1-snapshot-ae6484f43e6.jar">
3046-
<sha256 value="ba91caf5e0ebe1fdb598c5fac6a22d3ab8e909d4a5fe2156a5f7d2f3d37aaed3" origin="Generated by Gradle"/>
3044+
<component group="org.apache.lucene" name="lucene-queries" version="10.2.1">
3045+
<artifact name="lucene-queries-10.2.1.jar">
3046+
<sha256 value="0aff0eaa0f11f03c3dccd4f1e97db454794dd914946fe5d0669c3794673bfed0" origin="Generated by Gradle"/>
30473047
</artifact>
30483048
</component>
3049-
<component group="org.apache.lucene" name="lucene-queryparser" version="10.2.1-snapshot-ae6484f43e6">
3050-
<artifact name="lucene-queryparser-10.2.1-snapshot-ae6484f43e6.jar">
3051-
<sha256 value="c818fc0a8a4f7c89c8a4da68d09fc51519f71ef5fe126dea25e49d92f7ef3d5d" origin="Generated by Gradle"/>
3049+
<component group="org.apache.lucene" name="lucene-queryparser" version="10.2.1">
3050+
<artifact name="lucene-queryparser-10.2.1.jar">
3051+
<sha256 value="9f394d20f8420608e104b7a645f6b76c22ceb0b655476a9365a5746f3a2272be" origin="Generated by Gradle"/>
30523052
</artifact>
30533053
</component>
3054-
<component group="org.apache.lucene" name="lucene-sandbox" version="10.2.1-snapshot-ae6484f43e6">
3055-
<artifact name="lucene-sandbox-10.2.1-snapshot-ae6484f43e6.jar">
3056-
<sha256 value="92a7a3754250c37bd63aa3192706ae4c836fcb3a298596293b9d9964206d4ebe" origin="Generated by Gradle"/>
3054+
<component group="org.apache.lucene" name="lucene-sandbox" version="10.2.1">
3055+
<artifact name="lucene-sandbox-10.2.1.jar">
3056+
<sha256 value="b8feeb751e66694ea3b0e9e6df6340749b92127c281c8e6be5a408bcd710da04" origin="Generated by Gradle"/>
30573057
</artifact>
30583058
</component>
3059-
<component group="org.apache.lucene" name="lucene-spatial-extras" version="10.2.1-snapshot-ae6484f43e6">
3060-
<artifact name="lucene-spatial-extras-10.2.1-snapshot-ae6484f43e6.jar">
3061-
<sha256 value="ec61f33001af50a4244407ed4c06546c2d567b87c0e5f8a1076404972ed0355b" origin="Generated by Gradle"/>
3059+
<component group="org.apache.lucene" name="lucene-spatial-extras" version="10.2.1">
3060+
<artifact name="lucene-spatial-extras-10.2.1.jar">
3061+
<sha256 value="8c7ff3f251c765872e07fb2c2b6b8eb28d87bb5b34ba33fad5516b4d3b52dd5d" origin="Generated by Gradle"/>
30623062
</artifact>
30633063
</component>
3064-
<component group="org.apache.lucene" name="lucene-spatial3d" version="10.2.1-snapshot-ae6484f43e6">
3065-
<artifact name="lucene-spatial3d-10.2.1-snapshot-ae6484f43e6.jar">
3066-
<sha256 value="d7ef6ec7ec2c7111f41f494176ba82d9800afb46e1c129f5df175b3312c22f2a" origin="Generated by Gradle"/>
3064+
<component group="org.apache.lucene" name="lucene-spatial3d" version="10.2.1">
3065+
<artifact name="lucene-spatial3d-10.2.1.jar">
3066+
<sha256 value="70147dcbed711961bc18ada6ff957ff853a7d2d50496f7754d80041bf0d96eb4" origin="Generated by Gradle"/>
30673067
</artifact>
30683068
</component>
3069-
<component group="org.apache.lucene" name="lucene-suggest" version="10.2.1-snapshot-ae6484f43e6">
3070-
<artifact name="lucene-suggest-10.2.1-snapshot-ae6484f43e6.jar">
3071-
<sha256 value="834e34badfa0af72604641a1ac52c29f6bfc2d83e35006837ba752604f125b96" origin="Generated by Gradle"/>
3069+
<component group="org.apache.lucene" name="lucene-suggest" version="10.2.1">
3070+
<artifact name="lucene-suggest-10.2.1.jar">
3071+
<sha256 value="879e00b16f0c2ba13307784b5e1c35e5d6c6671a419f0f9140d3f595c1d6ef80" origin="Generated by Gradle"/>
30723072
</artifact>
30733073
</component>
3074-
<component group="org.apache.lucene" name="lucene-test-framework" version="10.2.1-snapshot-ae6484f43e6">
3075-
<artifact name="lucene-test-framework-10.2.1-snapshot-ae6484f43e6.jar">
3076-
<sha256 value="a7be31ba894f41ec43a51401b8094b1ea96a848362c9de494d2d5382a2aafc71" origin="Generated by Gradle"/>
3074+
<component group="org.apache.lucene" name="lucene-test-framework" version="10.2.1">
3075+
<artifact name="lucene-test-framework-10.2.1.jar">
3076+
<sha256 value="0c1dfd96bc2b505e221de7b58c954aa04803e7004de390189a7db6ab5cf91eac" origin="Generated by Gradle"/>
30773077
</artifact>
30783078
</component>
30793079
<component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">

‎server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.apache.lucene.search.TermQuery;
5656
import org.apache.lucene.search.TopDocs;
5757
import org.apache.lucene.search.TotalHits;
58+
import org.apache.lucene.search.TotalHits.Relation;
5859
import org.apache.lucene.search.Weight;
5960
import org.apache.lucene.search.join.BitSetProducer;
6061
import org.apache.lucene.search.join.ScoreMode;
@@ -567,12 +568,13 @@ public void testTerminateAfterWithHitsNoHitCountShortcut() throws Exception {
567568
// size is lower than terminate_after
568569
context.setSize(5);
569570
// track_total_hits is lower than terminate_after
570-
context.trackTotalHitsUpTo(randomIntBetween(1, 6));
571+
int trackTotalHits = randomIntBetween(1, 6);
572+
context.trackTotalHitsUpTo(trackTotalHits);
571573
QueryPhase.executeQuery(context);
572574
// depending on docs distribution we may or may not be able to honor terminate_after: low scoring hits are skipped via
573575
// setMinCompetitiveScore, which bypasses terminate_after until the next leaf collector is pulled, when that happens.
574576
assertThat(context.queryResult().terminatedEarly(), either(is(true)).or(is(false)));
575-
assertThat(context.queryResult().topDocs().topDocs.totalHits.value(), equalTo(7L));
577+
assertThat(context.queryResult().topDocs().topDocs.totalHits.value(), greaterThanOrEqualTo((long) trackTotalHits));
576578
assertThat(context.queryResult().topDocs().topDocs.totalHits.relation(), equalTo(TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO));
577579
assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(5));
578580
}
@@ -990,7 +992,10 @@ public void testMinScore() throws Exception {
990992
context.trackTotalHitsUpTo(5);
991993

992994
QueryPhase.addCollectorsAndSearch(context);
993-
assertEquals(10, context.queryResult().topDocs().topDocs.totalHits.value());
995+
TotalHits totalHits = context.queryResult().topDocs().topDocs.totalHits;
996+
assertThat(totalHits.value(), greaterThanOrEqualTo(5L));
997+
var expectedRelation = totalHits.value() == 10 ? Relation.EQUAL_TO : Relation.GREATER_THAN_OR_EQUAL_TO;
998+
assertThat(totalHits.relation(), is(expectedRelation));
994999
}
9951000
}
9961001

0 commit comments

Comments
 (0)