Merge branch 'main' into online_shard_split

Author: vikasvb90

.github/workflows/assemble.yml

@@ -1,5 +1,14 @@
 name: Gradle Assemble
-on: [pull_request]
+on:
+  pull_request:
+    # Skip this check unless files that could plausibly impact a
+    # distribution have changed.
+    paths:
+      - 'distribution/**'
+      - 'buildSrc/**'
+      - '**/*.gradle'
+      - 'gradle/**'
+      - '.github/workflows/assemble.yml'
 
 jobs:
   assemble:

.github/workflows/nightly-precommit.yml

@@ -0,0 +1,72 @@
+name: Nightly Gradle Precommit
+on:
+  schedule:
+    - cron: '0 6 * * *' # Daily at 6:00 AM UTC
+
+jobs:
+  # The precommit tasks are run on every PR as a part of `check`. This
+  # nightly workflow exists to ensure OpenSearch remains buildable on
+  # all supported platforms, but runs on a scheduled basis to reduce the
+  # overhead on all pull requests.
+  nightly-precommit:
+    if: github.repository == 'opensearch-project/OpenSearch'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [ 21, 25 ]
+        os: [ubuntu-latest, windows-latest, macos-15, macos-15-intel, ubuntu-24.04-arm]
+        include:
+          - java: 21
+            os: 'windows-2025'
+            experimental: true
+    steps:
+      - uses: actions/checkout@v6
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v5
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: temurin
+          cache: gradle
+      - name: Run Gradle (precommit)
+        continue-on-error: ${{ matrix.experimental }}
+        shell: bash
+        run: |
+          ./gradlew javadoc precommit --parallel
+
+  open-issue-on-failure:
+    if: failure() && github.event_name == 'schedule'
+    needs: precommit
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            const title = 'Nightly precommit failed';
+            const { data: existing_issues } = await github.rest.issues.listForRepo({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              labels: 'autocut,CI',
+              per_page: 100
+            });
+            const existing = existing_issues.find(i => i.title === title);
+            if (existing) {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: existing.number,
+                body: `Another nightly failure.\n\n[View run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`
+              });
+              console.log('Commented on existing issue.');
+              return;
+            }
+            const body = `The nightly precommit workflow failed.\n\n[View run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`;
+            await github.rest.issues.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title,
+              body,
+              labels: ['autocut', 'CI']
+            });

.github/workflows/precommit.yml

@@ -68,3 +68,4 @@ testfixtures_shared/
 
 # build files generated
 doc-tools/missing-doclet/bin/
+/sandbox/plugins/engine-datafusion/target/

.gitignore

@@ -45,11 +45,13 @@ abstract class AbstractGradleFuncTest extends Specification {
 
     File settingsFile
     File buildFile
+    File testKitDir
 
     def setup() {
         settingsFile = testProjectDir.newFile('settings.gradle')
         settingsFile << "rootProject.name = 'hello-world'\n"
         buildFile = testProjectDir.newFile('build.gradle')
+        testKitDir = testProjectDir.newFolder('.gradle-test-kit')
     }
 
     GradleRunner gradleRunner(String... arguments) {
@@ -62,6 +64,7 @@ abstract class AbstractGradleFuncTest extends Specification {
                 .withProjectDir(projectDir)
                 .withArguments(arguments)
                 .withPluginClasspath()
+                .withTestKitDir(testKitDir)
                 .forwardOutput()
     }
 

CHANGELOG.md

@@ -37,7 +37,7 @@ json_smart              = "2.5.2"
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = "5.16.0"
 
-netty             = "4.2.10.Final"
+netty             = "4.2.12.Final"
 joda              = "2.12.7"
 roaringbitmap     = "1.3.0"
 

buildSrc/src/integTest/groovy/org/opensearch/gradle/fixtures/AbstractGradleFuncTest.groovy

@@ -8,11 +8,14 @@
 
 package org.opensearch.common;
 
+import org.opensearch.common.annotation.PublicApi;
+
 /**
  * A {@link TriFunction}-like interface which allows throwing checked exceptions.
  *
  * @opensearch.internal
  */
+@PublicApi(since = "2.9.0")
 @FunctionalInterface
 public interface CheckedTriFunction<S, T, U, R, E extends Exception> {
     R apply(S s, T t, U u) throws E;

gradle/libs.versions.toml

@@ -35,6 +35,7 @@
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.core.Assertions;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 
@@ -56,6 +57,37 @@
  */
 @PublicApi(since = "1.0.0")
 public class Version implements Comparable<Version>, ToXContentFragment {
+    /**
+     * Exception thrown when an unsupported version ID is encountered.
+     */
+    public static class UnsupportedVersionException extends RuntimeException {
+        private final String versionString;
+
+        private UnsupportedVersionException(int versionId) {
+            super(String.format(Locale.ROOT, "Unsupported version [%s]", legacyFriendlyIdToString(versionId)));
+            this.versionString = legacyFriendlyIdToString(versionId);
+        }
+
+        public String getVersionString() {
+            return versionString;
+        }
+    }
+
+    private static String legacyFriendlyIdToString(int versionId) {
+        String prefix;
+        if ((versionId & MASK) != 0) {
+            versionId = versionId ^ MASK;
+            prefix = "";
+        } else {
+            prefix = "ES ";
+        }
+        int major = (versionId / MAJOR_SHIFT) % VERSION_SHIFT;
+        int minor = (versionId / MINOR_SHIFT) % VERSION_SHIFT;
+        int revision = (versionId / REVISION_SHIFT) % VERSION_SHIFT;
+
+        return prefix + major + "." + minor + "." + revision;
+    }
+
     private static final int VERSION_SHIFT = 100; // Two digits per version part
     private static final int REVISION_SHIFT = VERSION_SHIFT;
     private static final int MINOR_SHIFT = VERSION_SHIFT * VERSION_SHIFT;
@@ -212,7 +244,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
 
     public static Version fromId(int id) {
         if (id != 0 && (id & MASK) == 0) {
-            throw new IllegalArgumentException("Version id " + id + " must contain OpenSearch mask");
+            throw new UnsupportedVersionException(id);
         }
         final Version known = idToVersion.get(id);
         if (known != null) {
@@ -269,7 +301,7 @@ public static Version max(Version version1, Version version2) {
      * Returns the version given its string representation, current version if the argument is null or empty
      */
     public static Version fromString(String version) {
-        if (stringHasLength(version) == false) { // TODO replace with Strings.hasLength after refactoring Strings to core lib
+        if (Strings.hasLength(version) == false) {
             return Version.CURRENT;
         }
         final Version cached = stringToVersion.get(version);
@@ -599,11 +631,4 @@ public static List<Version> getDeclaredVersions(final Class<?> versionClass) {
         return versions;
     }
 
-    /**
-     * Check that the given String is neither <code>null</code> nor of length 0.
-     * Note: Will return <code>true</code> for a String that purely consists of whitespace.
-     */
-    public static boolean stringHasLength(String str) {
-        return (str != null && str.length() > 0);
-    }
 }

libs/common/src/main/java/org/opensearch/common/CheckedTriFunction.java

@@ -11,6 +11,7 @@
 import org.opensearch.Version;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.annotation.PublicApi;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.semver.expr.Caret;
@@ -80,7 +81,7 @@ public static SemverRange fromString(final String range) {
 
         RangeOperator rangeOperator = RangeOperator.fromRange(range);
         String version = range.replaceFirst(rangeOperator.asEscapedString(), "");
-        if (!Version.stringHasLength(version)) {
+        if (!Strings.hasLength(version)) {
             throw new IllegalArgumentException("Version cannot be empty");
         }
         return new SemverRange(Version.fromString(version), rangeOperator);