Upgrade to Lucene 9.9.1 (elastic#103387)

This commit upgrades to Lucene 9.9.1. With the upgrade to 9.9.1 we can now remove the compiler excludes added by elastic#103112.
carlosdelest · Dec 19, 2023 · 3f0a3dc · 3f0a3dc
1 parent 49f1b5b
commit 3f0a3dc
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 88 deletions.
diff --git a/...internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java b/...internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java
@@ -108,10 +108,7 @@ public void execute(Task t) {
                 "--add-opens=java.base/java.nio.file=ALL-UNNAMED",
                 "--add-opens=java.base/java.time=ALL-UNNAMED",
                 "--add-opens=java.management/java.lang.management=ALL-UNNAMED",
-                "-XX:+HeapDumpOnOutOfMemoryError",
-                // REMOVE once bumped to a JDK greater than 21.0.1, https://github.com/elastic/elasticsearch/issues/103004
-                "-XX:CompileCommand=exclude,org.apache.lucene.util.MSBRadixSorter::computeCommonPrefixLengthAndBuildHistogram",
-                "-XX:CompileCommand=exclude,org.apache.lucene.util.RadixSelector::computeCommonPrefixLengthAndBuildHistogram"
+                "-XX:+HeapDumpOnOutOfMemoryError"
             );
 
             test.getJvmArgumentProviders().add(new SimpleCommandLineArgumentProvider("-XX:HeapDumpPath=" + heapdumpDir));

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.13.0
-lucene            = 9.9.0-snapshot-bb4fec631e6
+lucene            = 9.9.1
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 21.0.1+12@415e3f918a1f4062a0074a2794853d0d

diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
@@ -58,10 +58,6 @@
 # result in less optimal vector performance
 20-:--add-modules=jdk.incubator.vector
 
-# REMOVE once bumped to a JDK greater than 21.0.1, https://github.com/elastic/elasticsearch/issues/103004
-19-21:-XX:CompileCommand=exclude,org.apache.lucene.util.MSBRadixSorter::computeCommonPrefixLengthAndBuildHistogram
-19-21:-XX:CompileCommand=exclude,org.apache.lucene.util.RadixSelector::computeCommonPrefixLengthAndBuildHistogram
-
 ## heap dumps
 
 # generate a heap dump when an allocation from the Java heap fails; heap dumps

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.9.0
-:lucene_version_path:   9_9_0
+:lucene_version:        9.9.1
+:lucene_version_path:   9_9_1
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

diff --git a/docs/changelog/103112.yaml b/docs/changelog/103112.yaml
diff --git a/docs/changelog/103387.yaml b/docs/changelog/103387.yaml
@@ -0,0 +1,5 @@
+pr: 103387
+summary: Upgrade to Lucene 9.9.1
+area: Search
+type: upgrade
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java
@@ -93,6 +93,7 @@ private static IndexVersion def(int id, Version luceneVersion) {
     public static final IndexVersion NORMALIZED_VECTOR_COSINE = def(8_500_005, Version.LUCENE_9_8_0);
     public static final IndexVersion UPGRADE_LUCENE_9_9 = def(8_500_006, Version.LUCENE_9_9_0);
     public static final IndexVersion ES_VERSION_8_13 = def(8_500_007, Version.LUCENE_9_9_0);
+    public static final IndexVersion UPGRADE_LUCENE_9_9_1 = def(8_500_008, Version.LUCENE_9_9_1);
 
     /*
      * STOP! READ THIS FIRST! No, really,