Merge branch 'main' into add_skip_factor

Signed-off-by: kkewwei <kewei.11@bytedance.com>

Author: kkewwei

CHANGELOG.md

@@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased 3.x]
 ### Added
 - Add support for Warm Indices Write Block on Flood Watermark breach ([#18375](https://github.com/opensearch-project/OpenSearch/pull/18375))
+- Add support for custom index name resolver from cluster plugin ([#18593](https://github.com/opensearch-project/OpenSearch/pull/18593))
+- Rename WorkloadGroupTestUtil to WorkloadManagementTestUtil ([#18709](https://github.com/opensearch-project/OpenSearch/pull/18709))
+- Disallow resize for Warm Index, add Parameterized ITs for close in remote store ([#18686](https://github.com/opensearch-project/OpenSearch/pull/18686))
 - Ability to run Code Coverage with Gradle and produce the jacoco reports locally ([#18509](https://github.com/opensearch-project/OpenSearch/issues/18509))
+- [Workload Management] Update logging and Javadoc, rename QueryGroup to WorkloadGroup ([#18711](https://github.com/opensearch-project/OpenSearch/issues/18711))
 - Add NodeResourceUsageStats to ClusterInfo ([#18480](https://github.com/opensearch-project/OpenSearch/issues/18472))
 - Introduce SecureHttpTransportParameters experimental API (to complement SecureTransportParameters counterpart) ([#18572](https://github.com/opensearch-project/OpenSearch/issues/18572))
 - Create equivalents of JSM's AccessController in the java agent ([#18346](https://github.com/opensearch-project/OpenSearch/issues/18346))
@@ -18,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add functionality for plugins to inject QueryCollectorContext during QueryPhase ([#18637](https://github.com/opensearch-project/OpenSearch/pull/18637))
 - Add support for non-timing info in profiler ([#18460](https://github.com/opensearch-project/OpenSearch/issues/18460))
 - Extend Approximation Framework to other numeric types ([#18530](https://github.com/opensearch-project/OpenSearch/issues/18530))
+- Add Semantic Version field type mapper and extensive unit tests([#18454](https://github.com/opensearch-project/OpenSearch/pull/18454))
 - Add a dynamic setting to change skip_cache_factor and min_frequency for querycache ([#18351](https://github.com/opensearch-project/OpenSearch/issues/18351))
 
 ### Changed
@@ -32,13 +37,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.apache.logging.log4j:log4j-core` from 2.24.3 to 2.25.0 ([#18589](https://github.com/opensearch-project/OpenSearch/pull/18589))
 - Bump `com.google.code.gson:gson` from 2.13.0 to 2.13.1 ([#18585](https://github.com/opensearch-project/OpenSearch/pull/18585))
 - Bump `com.azure:azure-core-http-netty` from 1.15.11 to 1.15.12 ([#18586](https://github.com/opensearch-project/OpenSearch/pull/18586))
-- Bump `com.squareup.okio:okio` from 3.13.0 to 3.14.0 ([#18645](https://github.com/opensearch-project/OpenSearch/pull/18645))
+- Bump `com.squareup.okio:okio` from 3.13.0 to 3.15.0 ([#18645](https://github.com/opensearch-project/OpenSearch/pull/18645), [#18689](https://github.com/opensearch-project/OpenSearch/pull/18689))
 - Bump `com.netflix.nebula.ospackage-base` from 11.11.2 to 12.0.0 ([#18646](https://github.com/opensearch-project/OpenSearch/pull/18646))
 - Bump `com.azure:azure-storage-blob` from 12.30.0 to 12.30.1 ([#18644](https://github.com/opensearch-project/OpenSearch/pull/18644))
 - Bump `org.bouncycastle:bctls-fips` from 2.0.19 to 2.0.20 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
 - Bump `org.bouncycastle:bcpkix-fips` from 2.0.7 to 2.0.8 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
 - Bump `org.bouncycastle:bcpg-fips` from 2.0.10 to 2.0.11 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
 - Bump `com.password4j:password4j` from 1.8.2 to 1.8.3 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
+- Bump `com.azure:azure-core` from 1.55.3 to 1.55.5 ([#18691](https://github.com/opensearch-project/OpenSearch/pull/18691))
 
 ### Deprecated
 
@@ -53,6 +59,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix the visit of sub queries for HasParentQuery and HasChildQuery ([#18621](https://github.com/opensearch-project/OpenSearch/pull/18621))
 - Fix the backward compatibility regression with COMPLEMENT for Regexp queries introduced in OpenSearch 3.0 ([#18640](https://github.com/opensearch-project/OpenSearch/pull/18640))
 - Fix Replication lag computation ([#18602](https://github.com/opensearch-project/OpenSearch/pull/18602))
+- Fixed Staggered merge -  load average replace with AverageTrackers, some Default thresholds modified ([#18666](https://github.com/opensearch-project/OpenSearch/pull/18666))
 
 ### Security
 

libs/core/src/main/java/org/opensearch/semver/SemverRange.java

@@ -16,11 +16,15 @@
 import org.opensearch.semver.expr.Caret;
 import org.opensearch.semver.expr.Equal;
 import org.opensearch.semver.expr.Expression;
+import org.opensearch.semver.expr.Range;
 import org.opensearch.semver.expr.Tilde;
 
 import java.io.IOException;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import static java.util.Arrays.stream;
 
@@ -31,19 +35,24 @@
  *     <li>'=' Requires exact match with the range version. For example, =1.2.3 range would match only 1.2.3</li>
  *     <li>'~' Allows for patch version variability starting from the range version. For example, ~1.2.3 range would match versions greater than or equal to 1.2.3 but less than 1.3.0</li>
  *     <li>'^' Allows for patch and minor version variability starting from the range version. For example, ^1.2.3 range would match versions greater than or equal to 1.2.3 but less than 2.0.0</li>
+ *     <li>Explicit ranges: [2.0.0,3.0.0], (2.0.0,3.0.0), [2.0.0,3.0.0), (2.0.0,3.0.0]</li>
  * </ul>
  *
  * @opensearch.api
  */
 @PublicApi(since = "2.13.0")
 public class SemverRange implements ToXContentFragment {
 
+    private static final Pattern RANGE_PATTERN = Pattern.compile("([\\[\\(])([\\d.]+)\\s*,\\s*([\\d.]+)([\\]\\)])");
+
     private final Version rangeVersion;
     private final RangeOperator rangeOperator;
+    private final Expression expression;
 
     public SemverRange(final Version rangeVersion, final RangeOperator rangeOperator) {
         this.rangeVersion = rangeVersion;
         this.rangeOperator = rangeOperator;
+        this.expression = rangeOperator.expression;
     }
 
     /**
@@ -52,6 +61,23 @@ public SemverRange(final Version rangeVersion, final RangeOperator rangeOperator
      * @return a {@code SemverRange}
      */
     public static SemverRange fromString(final String range) {
+        // Check if it's a range expression
+        Matcher matcher = RANGE_PATTERN.matcher(range);
+        if (matcher.matches()) {
+            char leftBracket = matcher.group(1).charAt(0);
+            String lowerVersionStr = matcher.group(2);
+            String upperVersionStr = matcher.group(3);
+            char rightBracket = matcher.group(4).charAt(0);
+
+            Version lowerVersion = Version.fromString(matcher.group(2));
+            Version upperVersion = Version.fromString(matcher.group(3));
+            boolean includeLower = leftBracket == '[';
+            boolean includeUpper = rightBracket == ']';
+
+            Range rangeExpression = new Range(lowerVersion, upperVersion, includeLower, includeUpper);
+            return new SemverRange(lowerVersion, RangeOperator.RANGE, rangeExpression);
+        }
+
         RangeOperator rangeOperator = RangeOperator.fromRange(range);
         String version = range.replaceFirst(rangeOperator.asEscapedString(), "");
         if (!Version.stringHasLength(version)) {
@@ -60,6 +86,12 @@ public static SemverRange fromString(final String range) {
         return new SemverRange(Version.fromString(version), rangeOperator);
     }
 
+    public SemverRange(Version rangeVersion, RangeOperator operator, Expression customExpression) {
+        this.rangeVersion = rangeVersion;
+        this.rangeOperator = operator;
+        this.expression = customExpression;
+    }
+
     /**
      * Return the range operator for this range.
      * @return range operator
@@ -94,7 +126,7 @@ public boolean isSatisfiedBy(final String versionToEvaluate) {
      * @see #isSatisfiedBy(String)
      */
     public boolean isSatisfiedBy(final Version versionToEvaluate) {
-        return this.rangeOperator.expression.evaluate(this.rangeVersion, versionToEvaluate);
+        return this.expression.evaluate(this.rangeVersion, versionToEvaluate);
     }
 
     @Override
@@ -106,16 +138,29 @@ public boolean equals(@Nullable final Object o) {
             return false;
         }
         SemverRange range = (SemverRange) o;
-        return Objects.equals(rangeVersion, range.rangeVersion) && rangeOperator == range.rangeOperator;
+        return Objects.equals(rangeVersion, range.rangeVersion)
+            && rangeOperator == range.rangeOperator
+            && Objects.equals(expression, range.expression);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(rangeVersion, rangeOperator);
+        return Objects.hash(rangeVersion, rangeOperator, expression);
     }
 
     @Override
     public String toString() {
+        if (rangeOperator == RangeOperator.RANGE && expression instanceof Range) {
+            Range range = (Range) expression;
+            return String.format(
+                Locale.ROOT,
+                "%s%s,%s%s",
+                range.isIncludeLower() ? "[" : "(",
+                range.getLowerBound(),
+                range.getUpperBound(),
+                range.isIncludeUpper() ? "]" : ")"
+            );
+        }
         return rangeOperator.asString() + rangeVersion;
     }
 
@@ -128,10 +173,10 @@ public XContentBuilder toXContent(final XContentBuilder builder, final Params pa
      * A range operator.
      */
     public enum RangeOperator {
-
         EQ("=", new Equal()),
         TILDE("~", new Tilde()),
         CARET("^", new Caret()),
+        RANGE("range", new Range()),
         DEFAULT("", new Equal());
 
         private final String operator;

libs/core/src/main/java/org/opensearch/semver/expr/Range.java

@@ -0,0 +1,95 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.semver.expr;
+
+import org.opensearch.Version;
+
+import java.util.Objects;
+
+/**
+ * Expression to evaluate version compatibility within a specified range with configurable bounds.
+ */
+public class Range implements Expression {
+    private final Version lowerBound;
+    private final Version upperBound;
+    private final boolean includeLower;
+    private final boolean includeUpper;
+
+    public Range() {
+        this.lowerBound = Version.fromString("0.0.0");  // Minimum version
+        this.upperBound = Version.fromString("999.999.999"); // Maximum version
+        this.includeLower = true;  // Default to inclusive bounds
+        this.includeUpper = true;
+    }
+
+    public Range(Version lowerBound, Version upperBound, boolean includeLower, boolean includeUpper) {
+        if (lowerBound == null) {
+            throw new IllegalArgumentException("Lower bound cannot be null");
+        }
+        if (upperBound == null) {
+            throw new IllegalArgumentException("Upper bound cannot be null");
+        }
+        if (lowerBound.after(upperBound)) {
+            throw new IllegalArgumentException("Lower bound must be less than or equal to upper bound");
+        }
+        this.lowerBound = lowerBound;
+        this.upperBound = upperBound;
+        this.includeLower = includeLower;
+        this.includeUpper = includeUpper;
+    }
+
+    public void updateRange(Range other) {
+        if (other == null) {
+            throw new IllegalArgumentException("Range cannot be null");
+        }
+    }
+
+    @Override
+    public boolean evaluate(final Version rangeVersion, final Version versionToEvaluate) {
+
+        boolean satisfiesLower = includeLower ? versionToEvaluate.onOrAfter(lowerBound) : versionToEvaluate.after(lowerBound);
+
+        boolean satisfiesUpper = includeUpper ? versionToEvaluate.onOrBefore(upperBound) : versionToEvaluate.before(upperBound);
+
+        return satisfiesLower && satisfiesUpper;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Range range = (Range) o;
+        return includeLower == range.includeLower
+            && includeUpper == range.includeUpper
+            && Objects.equals(lowerBound, range.lowerBound)
+            && Objects.equals(upperBound, range.upperBound);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(lowerBound, upperBound, includeLower, includeUpper);
+    }
+
+    public boolean isIncludeLower() {
+        return includeLower;
+    }
+
+    public boolean isIncludeUpper() {
+        return includeUpper;
+    }
+
+    public Version getLowerBound() {
+        return lowerBound;
+    }
+
+    public Version getUpperBound() {
+        return upperBound;
+    }
+
+}