Skip to content

Commit bfc7a5a

Browse files
nknizenknize
committed
Upgrade to Lucene 8.9 (opensearch-project#1080)
This commit upgrades to the official lucene 8.9 release Signed-off-by: Nicholas Walter Knize <[email protected]>
1 parent c15e687 commit bfc7a5a

File tree

48 files changed

+29
-25
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+29
-25
lines changed

‎buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
opensearch = 1.1.0
2-
lucene = 8.8.2
2+
lucene = 8.9.0
33

44
bundled_jdk_vendor = adoptopenjdk
55
bundled_jdk = 15.0.1+9

‎modules/lang-expression/licenses/lucene-expressions-8.8.2.jar.sha1

-1
This file was deleted.

‎modules/lang-expression/licenses/lucene-expressions-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c52e0f197d8f37fec8e679660a4814b8928e4db2

‎plugins/analysis-icu/licenses/lucene-analyzers-icu-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-icu/licenses/lucene-analyzers-icu-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
390ebbb1cdb3ab1e8e5286ae4d77d336fd3895ba

‎plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d7553997ad55671bb8c4c023f607f71463da4d0f

‎plugins/analysis-nori/licenses/lucene-analyzers-nori-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-nori/licenses/lucene-analyzers-nori-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
99ae12d053d27e2b8d78d084e1bf1c893b896554

‎plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
144cbfb8c5a66ae9ac7abddb8855974599d1ea67

‎plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
35f24955ae3d079a262a3aa7ac2ca2449c6d10ee

‎plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d2a6fb6327e54c4eccfaa0f8e74953cd69a31e07

‎plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.8.2.jar.sha1

-1
This file was deleted.

‎plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
37fd6e23bbb1c146c729bb32b6c043ed0642a73e

‎server/licenses/lucene-analyzers-common-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-analyzers-common-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18f3bbff2b7672ea0b9cc18c8110ef69c763ae6b

‎server/licenses/lucene-backward-codecs-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-backward-codecs-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fec88b5e71c699ceddc3ae0369481697ac9a5c96

‎server/licenses/lucene-core-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-core-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5c3f72357089f7f0c1ef44bbe7b4c67b6149a5af

‎server/licenses/lucene-grouping-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-grouping-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9440fdd430b1c2dadbf3bc72656848d61e6f747f

‎server/licenses/lucene-highlighter-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-highlighter-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
94e80bdeab170b0ce1b36a32b6a790d23d7f6d7b

‎server/licenses/lucene-join-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-join-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5ae97803efd3344597f6b6bdf823b18d130e8851

‎server/licenses/lucene-memory-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-memory-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
09423a6dca2a9ba665e644d86a713d9a6b2b0d3f

‎server/licenses/lucene-misc-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-misc-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
067494d621ba2ef1f2e4da3ef167106f00b52051

‎server/licenses/lucene-queries-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-queries-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c6bda4622abf240da6567a128242f46708fa6c00

‎server/licenses/lucene-queryparser-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-queryparser-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
95a9d8cf8ca8eaf9f241fd323697d26d211721b2

‎server/licenses/lucene-sandbox-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-sandbox-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
af9f6c0287465e17a520b93b684474712433b293

‎server/licenses/lucene-spatial-extras-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-spatial-extras-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c89f4e78712806e8d5bb4adfb21cf0722ad3f175

‎server/licenses/lucene-spatial3d-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-spatial3d-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0d1238c4e8bf4409b3bb3fbddf2e977b0f19b24b

‎server/licenses/lucene-suggest-8.8.2.jar.sha1

-1
This file was deleted.

‎server/licenses/lucene-suggest-8.9.0.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
98cb69950b48b829b6605a003c99aa7eb86fa9eb

‎server/src/main/java/org/opensearch/Version.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
7171
public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
7272

7373
public static final Version V_1_0_0 = new Version(1000099, org.apache.lucene.util.Version.LUCENE_8_8_2);
74-
public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_8_2);
74+
public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_9_0);
7575
public static final Version CURRENT = V_1_1_0;
7676

7777
public static Version readVersion(StreamInput in) throws IOException {

‎server/src/main/java/org/opensearch/index/engine/NoOpEngine.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected DirectoryReader open(final IndexCommit commit) throws IOException {
8686
final Directory directory = commit.getDirectory();
8787
final List<IndexCommit> indexCommits = DirectoryReader.listCommits(directory);
8888
final IndexCommit indexCommit = indexCommits.get(indexCommits.size() - 1);
89-
return new DirectoryReader(directory, new LeafReader[0]) {
89+
return new DirectoryReader(directory, new LeafReader[0], null) {
9090
@Override
9191
protected DirectoryReader doOpenIfChanged() {
9292
return null;

‎test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java

+4
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,10 @@ public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase {
208208
// LUCENE-8936
209209
.put("spanishminimalstem", Void.class)
210210
.put("delimitedboost", Void.class)
211+
// LUCENE-9574: test flags on tokens vs a bitmask and drops tokens that have all specified flags
212+
.put("dropifflagged", Void.class)
213+
// LUCENE-9575: recognize arbitrary patterns that include punctuation
214+
.put("patterntyping", Void.class)
211215
.immutableMap();
212216

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

0 commit comments

Comments
 (0)