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.

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

[Backport] [2.x] Bump Apache Lucene from 9.9.2 to 9.10.0 (#12392) #12393

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `gradle/wrapper-validation-action` from 1 to 2 ([#12367](https://github.com/opensearch-project/OpenSearch/pull/12367))
- Bump `netty` from 4.1.106.Final to 4.1.107.Final ([#12372](https://github.com/opensearch-project/OpenSearch/pull/12372))
- Bump `opentelemetry` from 1.34.1 to 1.35.0 ([#12388](https://github.com/opensearch-project/OpenSearch/pull/12388))
- Bump Apache Lucene from 9.9.2 to 9.10.0 ([#12392](https://github.com/opensearch-project/OpenSearch/pull/12392))

### Changed

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
opensearch = 2.13.0
lucene = 9.9.2
lucene = 9.10.0

bundled_jdk_vendor = adoptium
bundled_jdk = 21.0.2+13
Expand Down
1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
64e5624754d59386be5d9159c68f81ff96298704
1 change: 0 additions & 1 deletion libs/core/licenses/lucene-core-9.9.2.jar.sha1

This file was deleted.

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 @@ -124,7 +124,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_2_11_1 = new Version(2110199, org.apache.lucene.util.Version.LUCENE_9_7_0);
public static final Version V_2_11_2 = new Version(2110299, org.apache.lucene.util.Version.LUCENE_9_7_0);
public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_9_2);
public static final Version V_2_13_0 = new Version(2130099, org.apache.lucene.util.Version.LUCENE_9_9_2);
public static final Version V_2_13_0 = new Version(2130099, org.apache.lucene.util.Version.LUCENE_9_10_0);
public static final Version CURRENT = V_2_13_0;

public static Version fromId(int id) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e2daf2e568fe120e84567505f7c85643bb0b9dd2

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
92e559808a23f61c818ef90a9ccab3669a25caa0
1 change: 0 additions & 1 deletion server/licenses/lucene-analysis-common-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6570ebf974d07025ad4cd9ffaa9927546b534704
1 change: 0 additions & 1 deletion server/licenses/lucene-backward-codecs-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
64e5624754d59386be5d9159c68f81ff96298704
1 change: 0 additions & 1 deletion server/licenses/lucene-core-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b82838299e4fa423fc574c1c07405410823f74ce
1 change: 0 additions & 1 deletion server/licenses/lucene-grouping-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2f21ade4b4896f1ece2b3a823e1640c762c9d0cf
1 change: 0 additions & 1 deletion server/licenses/lucene-highlighter-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
541b722bb842817e2ec899cd4d0de2a136953f53
1 change: 0 additions & 1 deletion server/licenses/lucene-join-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06620029b6c7d84480fb7ad1ba0d72963111b765
1 change: 0 additions & 1 deletion server/licenses/lucene-memory-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3621206c534d253a0205f8a0293c146ff34d8b03
1 change: 0 additions & 1 deletion server/licenses/lucene-misc-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bbe2360c60a43bf41fbf05d5f0b4f471547217ba
1 change: 0 additions & 1 deletion server/licenses/lucene-queries-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c50f82d244ea5adac2d2d9295de85ddccc2d45cb
1 change: 0 additions & 1 deletion server/licenses/lucene-queryparser-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
80bc56b23b34cddab97557e5ada7cd0558dbf5e5
1 change: 0 additions & 1 deletion server/licenses/lucene-sandbox-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
055e6aa874b6ec9ddafc2e115055de1445c2df49
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial-extras-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06945a8b2a703062ce4b286ecceae7182b4f5f44
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial3d-9.9.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-9.10.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d2068ad997165a414927e8c0072d0b88741af069
1 change: 0 additions & 1 deletion server/licenses/lucene-suggest-9.9.2.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public final class TranslogLeafReader extends LeafReader {
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false,
false
);
private static final FieldInfo FAKE_ROUTING_FIELD = new FieldInfo(
Expand All @@ -108,6 +109,7 @@ public final class TranslogLeafReader extends LeafReader {
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false,
false
);
private static final FieldInfo FAKE_ID_FIELD = new FieldInfo(
Expand All @@ -126,6 +128,7 @@ public final class TranslogLeafReader extends LeafReader {
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false,
false
);
public static Set<String> ALL_FIELD_NAMES = Sets.newHashSet(FAKE_SOURCE_FIELD.name, FAKE_ROUTING_FIELD.name, FAKE_ID_FIELD.name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ private GetResult innerGetLoadFromStoredFields(
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false,
false
);
StoredFieldVisitor.Status status = fieldVisitor.needsField(fieldInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public void setUp() throws Exception {
0,
VectorEncoding.FLOAT32,
VectorSimilarityFunction.EUCLIDEAN,
false,
false
);

Expand Down
Loading