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

Update Apache Lucene to 9.7.0-snapshot-204acc3 #7887

Merged
merged 1 commit into from
Jun 6, 2023
Merged

Update Apache Lucene to 9.7.0-snapshot-204acc3 #7887

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.7.0-snapshot-4d1ed9e
lucene = 9.7.0-snapshot-204acc3

bundled_jdk_vendor = adoptium
bundled_jdk = 20.0.1+9
Expand Down
24 changes: 17 additions & 7 deletions libs/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,23 @@ tasks.named('forbiddenApisMain').configure {
tasks.named("thirdPartyAudit").configure {
ignoreMissingClasses(
// from log4j
'org.osgi.framework.Bundle',
'org.osgi.framework.BundleActivator',
'org.osgi.framework.BundleContext',
'org.osgi.framework.BundleEvent',
'org.osgi.framework.SynchronousBundleListener',
'org.osgi.framework.wiring.BundleWire',
'org.osgi.framework.wiring.BundleWiring'
*[
'org.osgi.framework.Bundle',
'org.osgi.framework.BundleActivator',
'org.osgi.framework.BundleContext',
'org.osgi.framework.BundleEvent',
'org.osgi.framework.SynchronousBundleListener',
'org.osgi.framework.wiring.BundleWire',
'org.osgi.framework.wiring.BundleWiring',
] + (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_20) ? [] : [
'jdk.incubator.vector.ByteVector',
'jdk.incubator.vector.FloatVector',
'jdk.incubator.vector.IntVector',
'jdk.incubator.vector.ShortVector',
'jdk.incubator.vector.Vector',
'jdk.incubator.vector.VectorOperators',
'jdk.incubator.vector.VectorSpecies'
]
)
}

Expand Down
1 change: 1 addition & 0 deletions libs/core/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3aa698cf90f074cbf24acfd7feaaad84c5a6f829
1 change: 0 additions & 1 deletion libs/core/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c31671978777d97c026b13decfbef1d7eeed4410
1 change: 0 additions & 1 deletion modules/lang-expression/licenses/lucene-expressions-9.7.0-snapshot-4d1ed9e.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.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e31f7c161ad2b7652b1ac9100b4fa67d52be86eb
1 change: 0 additions & 1 deletion plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0-snapshot-4d1ed9e.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.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed13aaa5843c76ba8bb9fcd1cac6de8855ea7f1c
1 change: 0 additions & 1 deletion plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0-snapshot-4d1ed9e.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.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f8673a2b86d3868e9ef2745d1d3fa9ad5a63e84f
1 change: 0 additions & 1 deletion plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0-snapshot-4d1ed9e.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.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f7a585d5f62033f19a5ec79b66a74cc24c9e9d10
1 change: 0 additions & 1 deletion plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0-snapshot-4d1ed9e.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.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
40ba622c3aa91a0a8f2747617fef8f59bf212345
1 change: 0 additions & 1 deletion plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0-snapshot-4d1ed9e.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.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e08432a3db0bde29f425812896bd695c5477b05f
1 change: 0 additions & 1 deletion plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a44008e83286060f0265a32f9a9b586e86ec03b1
1 change: 0 additions & 1 deletion ...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ tasks.named("processResources").configure {

tasks.named("thirdPartyAudit").configure {
ignoreMissingClasses(
*[
// from com.fasterxml.jackson.dataformat.yaml.YAMLMapper (jackson-dataformat-yaml)
'com.fasterxml.jackson.databind.ObjectMapper',

Expand Down Expand Up @@ -337,6 +338,15 @@ tasks.named("thirdPartyAudit").configure {
'com.google.common.geometry.S2Point',
'com.google.common.geometry.S2$Metric',
'com.google.common.geometry.S2LatLng'
] + (BuildParams.runtimeJavaVersion < JavaVersion.VERSION_20) ? [] : [
'jdk.incubator.vector.ByteVector',
'jdk.incubator.vector.FloatVector',
'jdk.incubator.vector.IntVector',
'jdk.incubator.vector.ShortVector',
'jdk.incubator.vector.Vector',
'jdk.incubator.vector.VectorOperators',
'jdk.incubator.vector.VectorSpecies'
]
)
ignoreViolations(
'com.google.protobuf.MessageSchema',
Expand Down
1 change: 1 addition & 0 deletions server/licenses/lucene-analysis-common-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5aa5989b931c68eee90b22bca3f1f280a7d5c1ee
1 change: 0 additions & 1 deletion server/licenses/lucene-analysis-common-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-backward-codecs-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2326fb4762cd14eff6bea770d5c85a848e7a2482
1 change: 0 additions & 1 deletion server/licenses/lucene-backward-codecs-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-core-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3aa698cf90f074cbf24acfd7feaaad84c5a6f829
1 change: 0 additions & 1 deletion server/licenses/lucene-core-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-grouping-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3251c58b21c5c205c63bbe618c0d3c1393908e1
1 change: 0 additions & 1 deletion server/licenses/lucene-grouping-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-highlighter-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2313a0755a5774eb5dfcdc116dc15bd9367c8cc1
1 change: 0 additions & 1 deletion server/licenses/lucene-highlighter-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-join-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
25fddcaf47d5614f48dc264f79151eb87990abd9
1 change: 0 additions & 1 deletion server/licenses/lucene-join-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-memory-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7c2aad4c1baa818a94bd787615e70824e6ae3a9d
1 change: 0 additions & 1 deletion server/licenses/lucene-memory-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-misc-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
56211acb2a31b1967568eba9953db502a53f9010
1 change: 0 additions & 1 deletion server/licenses/lucene-misc-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queries-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c45b1847150e2e2e6302177b41faf95df2ca4fbf
1 change: 0 additions & 1 deletion server/licenses/lucene-queries-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-queryparser-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d40fe6400f21564ccb50b6716ec42d8dcd526b9d
1 change: 0 additions & 1 deletion server/licenses/lucene-queryparser-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-sandbox-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e9347773d0b269768c58dd0b438bdc4b450f9185
1 change: 0 additions & 1 deletion server/licenses/lucene-sandbox-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial-extras-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7055502c9a77b9a93d1b96c99397fd765dd7891f
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial-extras-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-spatial3d-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a2c5a7be5887dacf89c251936c3f3388ca20d28e
1 change: 0 additions & 1 deletion server/licenses/lucene-spatial3d-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/lucene-suggest-9.7.0-snapshot-204acc3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1a076a8db84fa85634cc4894ee4fc78b5e69525c
1 change: 0 additions & 1 deletion server/licenses/lucene-suggest-9.7.0-snapshot-4d1ed9e.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/src/main/java/org/opensearch/index/search/MatchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.QueryBuilder;
import org.apache.lucene.util.TermAndBoost;
dblock marked this conversation as resolved.
Show resolved Hide resolved
import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings;
import org.opensearch.OpenSearchException;
import org.opensearch.common.io.stream.StreamInput;
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/org/opensearch/index/search/MultiMatchQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TermAndBoost;
import org.opensearch.common.lucene.search.Queries;
import org.opensearch.index.mapper.MappedFieldType;
import org.opensearch.index.query.AbstractQueryBuilder;
Expand Down
2 changes: 2 additions & 0 deletions test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
// LUCENE-10352
.put("daitchmokotoffsoundex", Void.class)
.put("persianstem", Void.class)
// https://github.com/apache/lucene/pull/12169
.put("word2vecsynonym", Void.class)
.immutableMap();

static final Map<String, Class<?>> KNOWN_CHARFILTERS = new MapBuilder<String, Class<?>>()
Expand Down