Skip to content

Upgrade lucene to version 10.2.1 #17961

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.

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
opensearch = "3.1.0"
lucene = "10.1.0"
lucene = "10.2.1"

bundled_jdk_vendor = "adoptium"
bundled_jdk = "21.0.7+6"
Expand All @@ -11,7 +11,7 @@ jts = "1.15.0"
jackson = "2.18.2"
jackson_databind = "2.18.2"
snakeyaml = "2.1"
icu4j = "75.1"
icu4j = "77.1"
supercsv = "2.4.0"
log4j = "2.21.0"
slf4j = "1.7.36"
Expand Down
1 change: 0 additions & 1 deletion libs/core/licenses/lucene-core-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f7bee3425ff6bff5e3ba50abfa1a0fdab2b2e46f
2 changes: 1 addition & 1 deletion libs/core/src/main/java/org/opensearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1);
public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1);
public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0);
public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_1_0);
public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_2_1);
public static final Version CURRENT = V_3_1_0;

public static Version fromId(int id) {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7704566e72d10bd73bea5ee0a7cfcdc98b9f50cf
1 change: 0 additions & 1 deletion plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
38693cf0b1d7362a8b726af74dc06026a7c23809

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4ffa9bc8accae6d5a4c988653d1fd12d6384bc63

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c37f5e3b1177a55ec8953ec343af5c578a02f40

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
df44aacdf3a1ef743f42e53dca65590b95bbcbdf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
026d48b44b17dff97ae5afd9007b124410ede1d1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e9c9447fd1729bdfa4b284fdfe52202300a0be8c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
80a5c751308add50f6d1d33acbfafd58d27b8b55

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
68df86cb2c1dddc3937824ea2cbe7803bf543ca1
1 change: 0 additions & 1 deletion server/licenses/lucene-analysis-common-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
82578c7a8804490f1f375ccf63e080afb8c0736b
1 change: 0 additions & 1 deletion server/licenses/lucene-backward-codecs-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
32eef677c300ac9989bda1045904adf8e925b9eb
1 change: 0 additions & 1 deletion server/licenses/lucene-core-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f7bee3425ff6bff5e3ba50abfa1a0fdab2b2e46f
1 change: 0 additions & 1 deletion server/licenses/lucene-grouping-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5d5069134efb0c6b482c2dcfecf8a90acf1ee03a
1 change: 0 additions & 1 deletion server/licenses/lucene-highlighter-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4166f6ddb748bfab3355ef29253377c60ef5c440
1 change: 0 additions & 1 deletion server/licenses/lucene-join-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ef2fe517b73f4b144b9ada326ae69c8f3e996042
1 change: 0 additions & 1 deletion server/licenses/lucene-memory-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7e595a1dff0859818dea02729123c3e1b2520e7f
1 change: 0 additions & 1 deletion server/licenses/lucene-misc-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4244b7b5f406e40d3f9805a5cb056e351242e86
1 change: 0 additions & 1 deletion server/licenses/lucene-queries-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ddb958b144351a7e693d8866d086aed443792ff6
1 change: 0 additions & 1 deletion server/licenses/lucene-queryparser-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f9d7cb8ec0f9fc838326e499c4bd0cb044af75e2
1 change: 0 additions & 1 deletion server/licenses/lucene-sandbox-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec539453eb49dd9e02f8ff4b14dc36a08f91436f
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial-extras-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d89b7dc7e2c86b5e8184b60732211f762c074979
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial3d-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9935b848d1e92eb8938b0cc5ce1b3ee565b0e231
1 change: 0 additions & 1 deletion server/licenses/lucene-suggest-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f798a0f8f3686a75bd3830610156d3b087299340
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ DocIdSet processLeaf(Query query, CompositeValuesCollectorQueue queue, LeafReade
upperBucket = (Long) upperValue;
}

DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values, field) : null;
DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values) : null;
Visitor visitor = new Visitor(context, queue, builder, values.getBytesPerDimension(), lowerBucket, upperBucket);
try {
values.intersect(visitor);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ DocIdSet processLeaf(Query query, CompositeValuesCollectorQueue queue, LeafReade
}
upperBucket = (BigInteger) upperValue;
}
DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values, field) : null;
DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values) : null;
Visitor visitor = new Visitor(
context,
queue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ private static class PruningCollector extends Collector {
postingMap.put(term, scorer);
}

this.queue = new DisiPriorityQueue(postingMap.size());
this.queue = DisiPriorityQueue.ofMaxSize(postingMap.size());
for (Scorer scorer : postingMap.values()) {
queue.add(new DisiWrapper(scorer, false));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
if (sortOrder == null || sortOrder.equals(SortOrder.ASC)) {
return new ScorerSupplier() {

final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField());
final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount);
long cost = -1;

Expand Down Expand Up @@ -395,7 +395,7 @@ public long cost() {
size += deletedDocs;
return new ScorerSupplier() {

final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField());
final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount);
long cost = -1;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti
return new ScorerSupplier() {
long cost = -1;

final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, field);
final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values);
final MergePointVisitor visitor = new MergePointVisitor(result);

@Override
Expand Down
1 change: 0 additions & 1 deletion test/framework/licenses/lucene-codecs-10.1.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions test/framework/licenses/lucene-codecs-10.2.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7fad476daca759c657ead0e83e46a343fd09d38d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f01401e66a71eca1a70d19cf8269f47d191b1a37
Loading