honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to lucene 8.5.1 release (#55229) (#55235) 

Upgrade to lucene 8.5.1 release that contains a bug fix for a bug that might introduce index corruption when deleting data from an index that was previously shrunk.
This commit is contained in:
Ignacio Vera 2020-04-15 17:35:42 +02:00 committed by GitHub
parent 4f2ab96f38
commit a677b63daa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
49 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/version.properties
View File

@ -1,5 +1,5 @@
elasticsearch = 7.8.0 elasticsearch = 7.8.0
lucene = 8.5.0 lucene = 8.5.1
bundled_jdk_vendor = adoptopenjdk bundled_jdk_vendor = adoptopenjdk
bundled_jdk = 14+36 bundled_jdk = 14+36

4
docs/Versions.asciidoc
View File

@ -1,8 +1,8 @@
include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[] include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[]
:lucene_version: 8.5.0 :lucene_version: 8.5.1
:lucene_version_path: 8_5_0 :lucene_version_path: 8_5_1
:jdk: 1.8.0_131 :jdk: 1.8.0_131
:jdk_major: 8 :jdk_major: 8
:build_flavor: default :build_flavor: default

1
modules/lang-expression/licenses/lucene-expressions-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
41fcbae8104c54487c83c002cf3da6a13065b7a4

1
modules/lang-expression/licenses/lucene-expressions-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
666436c6624adac8af49623e7ac58d565bd88902

1
plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
0697a7b06e4447be330f093e62d863deaadabc8c

1
plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
0a8422b9b8a1b936ff354add5fa70e8e74497b30

1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
b269efbdd16c28525942a27f5738c9d1348b6301

1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
87015734d14c46347fac8b6e5f52ea972082a34e

1
plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
056eef8f0a64a70cd9af070ecd8e17d33e55cb75

1
plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
bb3a59f0e68d659d677a9534282b94a3caaf20be

1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
356e39f7b4b0cf8bc6a766a54ab6b93b11c89f6d

1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
f281e8f6446250e0b2ef93768b9f822f4a2dc7b5

1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
6139d1cc3f51d6f5fc5ab9976dc5376b682d8332

1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d6f919075b16eb42461500838367227c467b633c

1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
f6c1757e23f0cbad2e4d2eb39a12d9deff2e802b

1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
6af456327323cf6897a5fe64ba9628556665094b

1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
e647c3158a092df07ba4ac1b827623f45176ef48

1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
1994c5719e4a6e39aaffdb2b5832511d87fbc675

1
server/licenses/lucene-analyzers-common-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
7156f2e545fd6e7faaee4781d15eb60cf5f07646

1
server/licenses/lucene-analyzers-common-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
704685ddf536e1af4da025b6e6f4e50b9846ef18

1
server/licenses/lucene-backward-codecs-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
5837d9ec231b998d9eb75a99f3bf1dc9748c8f46

1
server/licenses/lucene-backward-codecs-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
0ab12c24a7c33ef5dfe8b57f17f67fec4a3fee1c

1
server/licenses/lucene-core-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
3f9ea85fff4fc3f7c83869dddb9b0ef7818c0cae

1
server/licenses/lucene-core-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
24212de43c19269f5211f3e79eb2f414c4a0254b

1
server/licenses/lucene-grouping-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
08d26d94f32b38d15eaf68b17bef52158e4bbc87

1
server/licenses/lucene-grouping-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
4404f3ff6341b7518843d09141df743bf91a8284

1
server/licenses/lucene-highlighter-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
8c653f47ea042dec2920bab83b039774b567eb9f

1
server/licenses/lucene-highlighter-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
142f5f249aa0803f8283a3d08615e37a56f40e8a

1
server/licenses/lucene-join-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
98713495a3f48558a5acd7aaa22bfa7da394e78a

1
server/licenses/lucene-join-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b0a48846662fc504bd7796b5506dad94981fca08

1
server/licenses/lucene-memory-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
18e3ed87c7f29bb0fe4b5db244a4f31018a9e518

1
server/licenses/lucene-memory-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
ba9e24b90323aacc98a4ac661ac34bfbf0ed66d8

1
server/licenses/lucene-misc-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
9786e13764f55dbf28e71fe7e0a90d1e94bea0bc

1
server/licenses/lucene-misc-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a0418e9bc16fc876448accb828a6ca38ed63d4a8

1
server/licenses/lucene-queries-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
708c1f850ed70c506822b021a722e42f29c397a1

1
server/licenses/lucene-queries-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
269c67a4ee9b806cfdacddc211744243cbcbd127

1
server/licenses/lucene-queryparser-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
13c38f39b1a7d10c4749ba789fa95da5868d4885

1
server/licenses/lucene-queryparser-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
ee5ba0e07a178a32987b0a92da149f2104e26dd9

1
server/licenses/lucene-sandbox-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
2b275921f2fd92b15b4f1a2a565467c3fa221ef9

1
server/licenses/lucene-sandbox-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
f1461680109e499d8c58dcaf5d314aeeef41d99a

1
server/licenses/lucene-spatial-extras-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
a8603576227b03fa94c2cde81b877f711c8b4c3f

1
server/licenses/lucene-spatial-extras-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
eece1ef3f919634c79b9ae9d99264ac9efa4276c

1
server/licenses/lucene-spatial3d-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
6f05de532ca9497e4d8364addf123441b01372a8

1
server/licenses/lucene-spatial3d-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a8fb2771ac562d60a3c945a4cef0e3742c390329

1
server/licenses/lucene-suggest-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
4ae6bea433acecbbaf7ae8fa3d56941ec2ad004d

1
server/licenses/lucene-suggest-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b5613f4995836fd9edae5925ed38559460721492

38
server/src/main/java/org/elasticsearch/Version.java
View File

@ -59,9 +59,9 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST); public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
public static final Version V_6_0_0_alpha1 = public static final Version V_6_0_0_alpha1 =
new Version(6000001, org.apache.lucene.util.Version.LUCENE_7_0_0); new Version(6000001, org.apache.lucene.util.Version.LUCENE_7_0_0);
public static final Version V_6_0_0_alpha2 = public static final Version V_6_0_0_alpha2 =
new Version(6000002, org.apache.lucene.util.Version.LUCENE_7_0_0); new Version(6000002, org.apache.lucene.util.Version.LUCENE_7_0_0);
public static final Version V_6_0_0_beta1 = public static final Version V_6_0_0_beta1 =
new Version(6000026, org.apache.lucene.util.Version.LUCENE_7_0_0); new Version(6000026, org.apache.lucene.util.Version.LUCENE_7_0_0);
public static final Version V_6_0_0_beta2 = public static final Version V_6_0_0_beta2 =
@ -134,7 +134,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_7_6_2 = new Version(7060299, org.apache.lucene.util.Version.LUCENE_8_4_0); public static final Version V_7_6_2 = new Version(7060299, org.apache.lucene.util.Version.LUCENE_8_4_0);
public static final Version V_7_6_3 = new Version(7060399, org.apache.lucene.util.Version.LUCENE_8_4_0); public static final Version V_7_6_3 = new Version(7060399, org.apache.lucene.util.Version.LUCENE_8_4_0);
public static final Version V_7_7_0 = new Version(7070099, org.apache.lucene.util.Version.LUCENE_8_5_0); public static final Version V_7_7_0 = new Version(7070099, org.apache.lucene.util.Version.LUCENE_8_5_0);
public static final Version V_7_8_0 = new Version(7080099, org.apache.lucene.util.Version.LUCENE_8_5_0); public static final Version V_7_8_0 = new Version(7080099, org.apache.lucene.util.Version.LUCENE_8_5_1);
public static final Version CURRENT = V_7_8_0; public static final Version CURRENT = V_7_8_0;
private static final ImmutableOpenIntMap<Version> idToVersion; private static final ImmutableOpenIntMap<Version> idToVersion;
@ -149,7 +149,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
continue; continue;
} }
assert fieldName.matches("V_\\d+_\\d+_\\d+(_alpha[1,2]|_beta[1,2]|_rc[1,2])?") assert fieldName.matches("V_\\d+_\\d+_\\d+(_alpha[1,2]|_beta[1,2]|_rc[1,2])?")
: "expected Version field [" + fieldName + "] to match V_\\d+_\\d+_\\d+"; : "expected Version field [" + fieldName + "] to match V_\\d+_\\d+_\\d+";
try { try {
final Version version = (Version) declaredField.get(null); final Version version = (Version) declaredField.get(null);
if (Assertions.ENABLED) { if (Assertions.ENABLED) {
@ -168,14 +168,14 @@ public class Version implements Comparable<Version>, ToXContentFragment {
} }
final Version maybePrevious = builder.put(version.id, version); final Version maybePrevious = builder.put(version.id, version);
assert maybePrevious == null : assert maybePrevious == null :
"expected [" + version.id + "] to be uniquely mapped but saw [" + maybePrevious + "] and [" + version + "]"; "expected [" + version.id + "] to be uniquely mapped but saw [" + maybePrevious + "] and [" + version + "]";
} catch (final IllegalAccessException e) { } catch (final IllegalAccessException e) {
assert false : "Version field [" + fieldName + "] should be public"; assert false : "Version field [" + fieldName + "] should be public";
} }
} }
} }
assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to [" assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
+ org.apache.lucene.util.Version.LATEST + "] is still set to [" + CURRENT.luceneVersion + "]"; + org.apache.lucene.util.Version.LATEST + "] is still set to [" + CURRENT.luceneVersion + "]";
idToVersion = builder.build(); idToVersion = builder.build();
} }
@ -212,7 +212,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
// assume it is the previous major to the oldest Lucene version // assume it is the previous major to the oldest Lucene version
// that we know about // that we know about
luceneVersion = org.apache.lucene.util.Version.fromBits( luceneVersion = org.apache.lucene.util.Version.fromBits(
versions.get(0).luceneVersion.major - 1, 0, 0); versions.get(0).luceneVersion.major - 1, 0, 0);
} else { } else {
luceneVersion = versions.get(index).luceneVersion; luceneVersion = versions.get(index).luceneVersion;
} }
@ -230,10 +230,10 @@ public class Version implements Comparable<Version>, ToXContentFragment {
final Version indexVersion = IndexMetadata.SETTING_INDEX_VERSION_CREATED.get(indexSettings); final Version indexVersion = IndexMetadata.SETTING_INDEX_VERSION_CREATED.get(indexSettings);
if (indexVersion == V_EMPTY) { if (indexVersion == V_EMPTY) {
final String message = String.format( final String message = String.format(
Locale.ROOT, Locale.ROOT,
"[%s] is not present in the index settings for index with UUID [%s]", "[%s] is not present in the index settings for index with UUID [%s]",
IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(), IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(),
indexSettings.get(IndexMetadata.SETTING_INDEX_UUID)); indexSettings.get(IndexMetadata.SETTING_INDEX_UUID));
throw new IllegalStateException(message); throw new IllegalStateException(message);
} }
return indexVersion; return indexVersion;
@ -269,7 +269,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
String[] parts = version.split("[.-]"); String[] parts = version.split("[.-]");
if (parts.length < 3 || parts.length > 4) { if (parts.length < 3 || parts.length > 4) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"the version needs to contain major, minor, and revision, and optionally the build: " + version); "the version needs to contain major, minor, and revision, and optionally the build: " + version);
} }
try { try {
@ -424,14 +424,14 @@ public class Version implements Comparable<Version>, ToXContentFragment {
@SuppressForbidden(reason = "System.out.*") @SuppressForbidden(reason = "System.out.*")
public static void main(String[] args) { public static void main(String[] args) {
final String versionOutput = String.format( final String versionOutput = String.format(
Locale.ROOT, Locale.ROOT,
"Version: %s, Build: %s/%s/%s/%s, JVM: %s", "Version: %s, Build: %s/%s/%s/%s, JVM: %s",
Build.CURRENT.getQualifiedVersion(), Build.CURRENT.getQualifiedVersion(),
Build.CURRENT.flavor().displayName(), Build.CURRENT.flavor().displayName(),
Build.CURRENT.type().displayName(), Build.CURRENT.type().displayName(),
Build.CURRENT.hash(), Build.CURRENT.hash(),
Build.CURRENT.date(), Build.CURRENT.date(),
JvmInfo.jvmInfo().version()); JvmInfo.jvmInfo().version());
System.out.println(versionOutput); System.out.println(versionOutput);
} }

1
x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0.jar.sha1
View File

@ -1 +0,0 @@
3f9ea85fff4fc3f7c83869dddb9b0ef7818c0cae

1
x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.1.jar.sha1 Normal file
View File

@ -0,0 +1 @@
24212de43c19269f5211f3e79eb2f414c4a0254b