Upgrading lucene

mohitamg · mohitamg · commit 964b762ed5a2 · 2025-02-25T21:27:51.000+05:30
Signed-off-by: Mohit Kumar &lt;mohitamg@amazon.com&gt;
diff --git a/.github/actions/create-bwc-build/action.yaml b/.github/actions/create-bwc-build/action.yaml
@@ -25,7 +25,7 @@ runs:
       with:
         path: ${{ inputs.plugin-branch }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       if: ${{ inputs.plugin-branch != 'current_branch' }}
       with:
         repository: opensearch-project/custom-codecs
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -44,7 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: temurin
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,12 @@ env:
 jobs:
 
   backward-compatibility-build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04-arm  # arm64-preview
+          - ubuntu-24.04  # x64
     steps:
       - uses: actions/setup-java@v4
         with:
diff --git a/.github/workflows/publish-maven-snapshots.yml b/.github/workflows/publish-maven-snapshots.yml
@@ -17,11 +17,11 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 21
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: aws-actions/configure-aws-credentials@v1
         with:
           role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
diff --git a/build.gradle b/build.gradle
@@ -31,9 +31,9 @@
 buildscript {
   ext {
     opensearch_group = "org.opensearch"
-    opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
+    opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-    buildVersionQualifier = System.getProperty("build.version_qualifier", "")
+    buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1")
   }
 
   repositories {
diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle
@@ -44,7 +44,7 @@ ext {
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")
         opensearch_group = "org.opensearch"
     }
     repositories {
diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/Lucene912CustomCodec.java b/src/main/java/org/opensearch/index/codec/customcodecs/Lucene912CustomCodec.java
@@ -9,9 +9,10 @@
 package org.opensearch.index.codec.customcodecs;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.FilterCodec;
 import org.apache.lucene.codecs.StoredFieldsFormat;
-import org.apache.lucene.codecs.lucene912.Lucene912Codec;
+import org.apache.lucene.codecs.lucene101.Lucene101Codec;
 import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec;
 import org.opensearch.index.mapper.MapperService;
 
@@ -98,7 +99,7 @@ public Lucene912CustomCodec(Mode mode, int compressionLevel) {
      * @param logger The logger.
      */
     public Lucene912CustomCodec(Mode mode, int compressionLevel, MapperService mapperService, Logger logger) {
-        super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene912Codec.Mode.BEST_SPEED, mapperService, logger));
+        super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene101Codec.Mode.BEST_SPEED, mapperService, logger));
         this.storedFieldsFormat = new Lucene912CustomStoredFieldsFormat(mode, compressionLevel);
     }
 
diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/Lucene912QatCodec.java b/src/main/java/org/opensearch/index/codec/customcodecs/Lucene912QatCodec.java
@@ -9,9 +9,10 @@
 package org.opensearch.index.codec.customcodecs;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.FilterCodec;
 import org.apache.lucene.codecs.StoredFieldsFormat;
-import org.apache.lucene.codecs.lucene912.Lucene912Codec;
+import org.apache.lucene.codecs.lucene101.Lucene101Codec;
 import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec;
 import org.opensearch.index.mapper.MapperService;
 
@@ -107,7 +108,7 @@ public Lucene912QatCodec(Mode mode, int compressionLevel, Supplier<QatZipper.Mod
      * @param logger The logger.
      */
     public Lucene912QatCodec(Mode mode, int compressionLevel, MapperService mapperService, Logger logger) {
-        super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene912Codec.Mode.BEST_SPEED, mapperService, logger));
+        super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene101Codec.Mode.BEST_SPEED, mapperService, logger));
         this.storedFieldsFormat = new Lucene912QatStoredFieldsFormat(mode, compressionLevel);
     }
 
@@ -129,7 +130,7 @@ public Lucene912QatCodec(
         Logger logger,
         Supplier<QatZipper.Mode> supplier
     ) {
-        super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene912Codec.Mode.BEST_SPEED, mapperService, logger));
+        super(mode.getCodec(), new PerFieldMappingPostingFormatCodec(Lucene101Codec.Mode.BEST_SPEED, mapperService, logger));
         this.storedFieldsFormat = new Lucene912QatStoredFieldsFormat(mode, compressionLevel, supplier);
     }
 
diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/QatCompressionMode.java b/src/main/java/org/opensearch/index/codec/customcodecs/QatCompressionMode.java
@@ -125,7 +125,7 @@ private void compress(byte[] bytes, int offset, int length, DataOutput out) thro
 
         @Override
         public void compress(ByteBuffersDataInput buffersInput, DataOutput out) throws IOException {
-            final int length = (int) buffersInput.size();
+            final int length = (int) buffersInput.length();
             byte[] bytes = new byte[length];
             buffersInput.readBytes(bytes, 0, length);
             compress(bytes, 0, length, out);
diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/ZstdCompressionMode.java b/src/main/java/org/opensearch/index/codec/customcodecs/ZstdCompressionMode.java
@@ -117,7 +117,7 @@ private void compress(byte[] bytes, int offset, int length, DataOutput out) thro
 
         @Override
         public void compress(ByteBuffersDataInput buffersInput, DataOutput out) throws IOException {
-            final int length = (int) buffersInput.size();
+            final int length = (int) buffersInput.length();
             byte[] bytes = new byte[length];
             buffersInput.readBytes(bytes, 0, length);
             compress(bytes, 0, length, out);
diff --git a/src/main/java/org/opensearch/index/codec/customcodecs/ZstdNoDictCompressionMode.java b/src/main/java/org/opensearch/index/codec/customcodecs/ZstdNoDictCompressionMode.java
@@ -105,7 +105,7 @@ private void compress(byte[] bytes, int offset, int length, DataOutput out) thro
 
         @Override
         public void compress(ByteBuffersDataInput buffersInput, DataOutput out) throws IOException {
-            final int length = (int) buffersInput.size();
+            final int length = (int) buffersInput.length();
             byte[] bytes = new byte[length];
             buffersInput.readBytes(bytes, 0, length);
             compress(bytes, 0, length, out);
diff --git a/src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java b/src/test/java/org/opensearch/index/codec/customcodecs/CustomCodecTests.java
@@ -33,9 +33,9 @@
 package org.opensearch.index.codec.customcodecs;
 
 import org.apache.logging.log4j.LogManager;
+import org.apache.lucene.backward_codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat;
-import org.apache.lucene.codecs.lucene912.Lucene912Codec;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ ext {`
`44`	`44`
`45`	`45`	`buildscript {`
`46`	`46`	`ext {`
`47`		`- opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")`
	`47`	`+ opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT")`
`48`	`48`	`opensearch_group = "org.opensearch"`
`49`	`49`	`}`
`50`	`50`	`repositories {`