Update to Apache Lucene 10 for 3.0.0

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Author: reta

.github/workflows/assemble.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 21, 23 ]
         os: [ubuntu-latest, windows-latest, macos-13]
     steps:
       - uses: actions/checkout@v4
@@ -16,17 +16,6 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
-      - name: Set up JDK 17
-        # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-        if: matrix.java == 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-      - name: Set JAVA${{ matrix.java }}_HOME
-        shell: bash
-        run: |
-          echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV
       - name: Setup docker (missing on MacOS)
         id: setup_docker
         if: runner.os == 'macos'
@@ -47,8 +36,8 @@ jobs:
         shell: bash
         if: runner.os != 'macos'
         run: |
-          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=${{ matrix.java }} 
+          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE 
       - name: Run Gradle (assemble)
         if: runner.os == 'macos' && steps.setup_docker.outcome == 'success'
         run: |
-          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE -Druntime.java=${{ matrix.java }}
+          ./gradlew assemble --parallel --no-build-cache -PDISABLE_BUILD_CACHE

.github/workflows/precommit.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11, 17, 21, 23 ]
+        java: [ 21, 23 ]
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
     steps:
       - uses: actions/checkout@v4
@@ -17,18 +17,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: temurin
           cache: gradle
-      - name: Set up JDK 17
-        # See please https://docs.gradle.org/8.10/userguide/upgrading_version_8.html#minimum_daemon_jvm_version
-        if: matrix.java == 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-      - name: Set JAVA${{ matrix.java }}_HOME
-        shell: bash
-        run: |
-          echo "JAVA${{ matrix.java }}_HOME=$JAVA_HOME_${{ matrix.java }}_${{ runner.arch }}" >> $GITHUB_ENV
       - name: Run Gradle (precommit)
         shell: bash
         run: |
-          ./gradlew javadoc precommit --parallel -Druntime.java=${{ matrix.java }}
+          ./gradlew javadoc precommit --parallel

buildSrc/build.gradle

@@ -171,8 +171,8 @@ if (project != rootProject) {
 
   allprojects {
     java {
-        targetCompatibility = JavaVersion.VERSION_11
-        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_21
     }
   }
 

buildSrc/reaper/build.gradle

@@ -12,8 +12,8 @@
 apply plugin: 'java'
 
 java {
-  targetCompatibility = JavaVersion.VERSION_11
-  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_21
+  sourceCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

buildSrc/src/testKit/thirdPartyAudit/build.gradle

@@ -46,11 +46,11 @@ dependencies {
 }
 
 tasks.register("empty", ThirdPartyAuditTask) {
-  targetCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_21
   signatureFile = file('third-party-audit-empty.txt')
 }
 
 tasks.register("absurd", ThirdPartyAuditTask) {
-  targetCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_21
   signatureFile = file('third-party-audit-absurd.txt')
 }

buildSrc/version.properties

@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.12.0
+lucene            = 10.0.0
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 23+37

libs/core/licenses/lucene-core-10.0.0.jar.sha1

@@ -0,0 +1 @@
+5a9b3f728041df5b054aaaed3c3fd7ff0fed8ee7

libs/core/licenses/lucene-core-9.12.0.jar.sha1

@@ -50,7 +50,7 @@ public class LegacyESVersion extends Version {
 
     public static final LegacyESVersion V_6_0_0 = new LegacyESVersion(6000099, org.apache.lucene.util.Version.fromBits(7, 0, 0));
     public static final LegacyESVersion V_6_5_0 = new LegacyESVersion(6050099, org.apache.lucene.util.Version.fromBits(7, 0, 0));
-    public static final LegacyESVersion V_7_2_0 = new LegacyESVersion(7020099, org.apache.lucene.util.Version.LUCENE_8_0_0);
+    public static final LegacyESVersion V_7_2_0 = new LegacyESVersion(7020099, org.apache.lucene.util.Version.fromBits(8, 0, 0));
 
     // todo move back to Version.java if retiring legacy version support
     protected static final Map<Integer, Version> idToVersion;

libs/core/src/main/java/org/opensearch/LegacyESVersion.java

@@ -112,7 +112,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_17_1 = new Version(2170199, org.apache.lucene.util.Version.LUCENE_9_11_1);
     public static final Version V_2_17_2 = new Version(2170299, org.apache.lucene.util.Version.LUCENE_9_11_1);
     public static final Version V_2_18_0 = new Version(2180099, org.apache.lucene.util.Version.LUCENE_9_12_0);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_12_0);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_0_0);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version fromId(int id) {

libs/core/src/main/java/org/opensearch/Version.java

@@ -0,0 +1 @@
+89b26348ec305598fc224cc9583939564b67b2cf

modules/lang-expression/licenses/lucene-expressions-10.0.0.jar.sha1

@@ -0,0 +1 @@
+082c38c1335c069a73622c37ca3d39e64c1b2d33

modules/lang-expression/licenses/lucene-expressions-9.12.0.jar.sha1

@@ -0,0 +1 @@
+26071742008630779523d08c0b46b2f371ef23a0

plugins/analysis-icu/licenses/lucene-analysis-icu-10.0.0.jar.sha1

@@ -0,0 +1 @@
+4a6ff02a1bd34a3c0165da05f714bb8188074bdc

plugins/analysis-icu/licenses/lucene-analysis-icu-9.12.0.jar.sha1

@@ -0,0 +1 @@
+4c488697df5038a78e5e65bb9b6da120af62d824

plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.0.0.jar.sha1

@@ -0,0 +1 @@
+1137b9846ec000b49c70c3fe5f8cd79b7129be22

plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.12.0.jar.sha1

@@ -0,0 +1 @@
+3fd86db5e9748063369db4bed84f1bd2ca62d387

plugins/analysis-nori/licenses/lucene-analysis-nori-10.0.0.jar.sha1

@@ -0,0 +1 @@
+4e6b940b3b934d6de174fedaaeaefd647698648d

plugins/analysis-nori/licenses/lucene-analysis-nori-9.12.0.jar.sha1

@@ -0,0 +1 @@
+13eb016bab14973158554a2e6cdf2abbc5c3eda1

plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.0.0.jar.sha1

@@ -0,0 +1 @@
+8e21f708eb1bbb71ce79cbfea093b6ca913f4abf

plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.12.0.jar.sha1

@@ -0,0 +1 @@
+5a9b3f728041df5b054aaaed3c3fd7ff0fed8ee7

plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.0.0.jar.sha1

@@ -0,0 +1 @@
+17145d786d31e7ecd68d149ccc3e7ab83270f282

plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.12.0.jar.sha1

@@ -0,0 +1 @@
+b8324f1b859620912c186b27d9666215ce3d258b

plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.0.0.jar.sha1

@@ -0,0 +1 @@
+3a4c5bf84c855b011e740f30cb8a23f2ee85e1c1

plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.12.0.jar.sha1

@@ -0,0 +1 @@
+bc0f37a0a06b445555d07e5fe199d73436d51352

plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.0.0.jar.sha1

@@ -0,0 +1 @@
+5f619b32c62bb9405e7af595cf7311113ed62e33

plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.12.0.jar.sha1

@@ -0,0 +1 @@
+3d2f98787e27e8e2a65d994c86563edf16dd92f1

server/licenses/lucene-analysis-common-10.0.0.jar.sha1

@@ -0,0 +1 @@
+e11886c913058ef20378715dee715d942d04babc

server/licenses/lucene-analysis-common-9.12.0.jar.sha1

@@ -0,0 +1 @@
+1795ce5b066bda61483c375f6b8e358aaa4f6348

server/licenses/lucene-backward-codecs-10.0.0.jar.sha1

@@ -0,0 +1 @@
+a701eb363cf0a75ebacd1844398314250abcf592

server/licenses/lucene-backward-codecs-9.12.0.jar.sha1

@@ -0,0 +1 @@
+d9e0a8a6084d7657a633c1aa94d750414f5288c4

server/licenses/lucene-core-10.0.0.jar.sha1

@@ -0,0 +1 @@
+d79099abc148a1906e129abbabd5e1b18a20c117

server/licenses/lucene-core-9.12.0.jar.sha1

@@ -192,10 +192,10 @@ public static CollapseTopFieldDocs merge(Sort sort, int start, int size, Collaps
             final CollapseTopFieldDocs shard = shardHits[shardIDX];
             // totalHits can be non-zero even if no hits were
             // collected, when searchAfter was used:
-            totalHitCount += shard.totalHits.value;
+            totalHitCount += shard.totalHits.value();
             // If any hit count is a lower bound then the merged
             // total hit count is a lower bound as well
-            if (shard.totalHits.relation == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO) {
+            if (shard.totalHits.relation() == TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO) {
                 totalHitsRelation = TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO;
             }
             if (CollectionUtils.isEmpty(shard.scoreDocs) == false) {

server/licenses/lucene-grouping-10.0.0.jar.sha1

@@ -229,7 +229,7 @@ public void setNextReader(LeafReaderContext readerContext) throws IOException {
                             public boolean advanceExact(int target) throws IOException {
                                 if (sorted.advanceExact(target)) {
                                     ord = (int) sorted.nextOrd();
-                                    if (sorted.nextOrd() != SortedSetDocValues.NO_MORE_ORDS) {
+                                    if (sorted.nextOrd() != SortedSetDocValues.NO_MORE_DOCS) {
                                         throw new IllegalStateException(
                                             "failed to collapse " + target + ", the collapse field must be single valued"
                                         );

server/licenses/lucene-grouping-9.12.0.jar.sha1

@@ -534,7 +534,7 @@ public static Reader getDirectReader(IndexInput in) throws IOException {
      */
     public static Mutable getMutable(int valueCount, int bitsPerValue, float acceptableOverheadRatio) {
         final FormatAndBits formatAndBits = fastestFormatAndBits(valueCount, bitsPerValue, acceptableOverheadRatio);
-        return getMutable(valueCount, formatAndBits.bitsPerValue, formatAndBits.format);
+        return getMutable(valueCount, formatAndBits.bitsPerValue(), formatAndBits.format());
     }
 
     /**
@@ -629,7 +629,13 @@ public static Writer getWriter(DataOutput out, int valueCount, int bitsPerValue,
         assert valueCount >= 0;
 
         final FormatAndBits formatAndBits = fastestFormatAndBits(valueCount, bitsPerValue, acceptableOverheadRatio);
-        final XWriter writer = getWriterNoHeader(out, formatAndBits.format, valueCount, formatAndBits.bitsPerValue, DEFAULT_BUFFER_SIZE);
+        final XWriter writer = getWriterNoHeader(
+            out,
+            formatAndBits.format(),
+            valueCount,
+            formatAndBits.bitsPerValue(),
+            DEFAULT_BUFFER_SIZE
+        );
         writer.writeHeader();
         return writer;
     }

server/licenses/lucene-highlighter-10.0.0.jar.sha1

@@ -77,7 +77,7 @@ SearchSortValuesAndFormats getBottomSortValues() {
     }
 
     synchronized void consumeTopDocs(TopFieldDocs topDocs, DocValueFormat[] sortValuesFormat) {
-        totalHits += topDocs.totalHits.value;
+        totalHits += topDocs.totalHits.value();
         if (validateShardSortFields(topDocs.fields) == false) {
             return;
         }

server/licenses/lucene-highlighter-9.12.0.jar.sha1

@@ -802,8 +802,8 @@ TotalHits getTotalHits() {
 
         void add(TopDocsAndMaxScore topDocs, boolean timedOut, Boolean terminatedEarly) {
             if (trackTotalHitsUpTo != SearchContext.TRACK_TOTAL_HITS_DISABLED) {
-                totalHits += topDocs.topDocs.totalHits.value;
-                if (topDocs.topDocs.totalHits.relation == Relation.GREATER_THAN_OR_EQUAL_TO) {
+                totalHits += topDocs.topDocs.totalHits.value();
+                if (topDocs.topDocs.totalHits.relation() == Relation.GREATER_THAN_OR_EQUAL_TO) {
                     totalHitsRelation = TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO;
                 }
             }

server/licenses/lucene-join-10.0.0.jar.sha1

@@ -703,7 +703,7 @@ String jvmVendor() {
         }
 
         String javaVersion() {
-            return Constants.JAVA_VERSION;
+            return Runtime.version().toString();
         }
 
     }

server/licenses/lucene-join-9.12.0.jar.sha1

@@ -423,8 +423,8 @@ public static ScoreDoc readScoreDoc(StreamInput in) throws IOException {
     private static final Class<?> GEO_DISTANCE_SORT_TYPE_CLASS = LatLonDocValuesField.newDistanceSort("some_geo_field", 0, 0).getClass();
 
     public static void writeTotalHits(StreamOutput out, TotalHits totalHits) throws IOException {
-        out.writeVLong(totalHits.value);
-        out.writeEnum(totalHits.relation);
+        out.writeVLong(totalHits.value());
+        out.writeEnum(totalHits.relation());
     }
 
     public static void writeTopDocs(StreamOutput out, TopDocsAndMaxScore topDocs) throws IOException {

server/licenses/lucene-memory-10.0.0.jar.sha1

@@ -50,6 +50,7 @@
 import org.apache.lucene.util.BitSet;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOBooleanSupplier;
 import org.opensearch.common.Nullable;
 
 import java.io.IOException;
@@ -256,4 +257,9 @@ public ImpactsEnum impacts(int flags) throws IOException {
     public BytesRef next() throws IOException {
         throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
     }
+
+    @Override
+    public IOBooleanSupplier prepareSeekExact(BytesRef text) throws IOException {
+        throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE);
+    }
 }

server/licenses/lucene-memory-9.12.0.jar.sha1

@@ -137,7 +137,7 @@ public static Query applyMinimumShouldMatch(BooleanQuery query, @Nullable String
         }
         int optionalClauses = 0;
         for (BooleanClause c : query.clauses()) {
-            if (c.getOccur() == BooleanClause.Occur.SHOULD) {
+            if (c.occur() == BooleanClause.Occur.SHOULD) {
                 optionalClauses++;
             }
         }