Merge branch 'main' into kumargu_java_agent_v1

Signed-off-by: Gulshan <[email protected]>

Author: kumargu

.ci/bwcVersions

@@ -45,4 +45,3 @@ BWC_VERSION:
   - "2.19.0"
   - "2.19.1"
   - "2.19.2"
-  - "2.20.0"

.github/workflows/gradle-check.yml

@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Get changed files
       id: changed-files-specific
-      uses: tj-actions/changed-files@v45
+      uses: tj-actions/changed-files@v46.0.1
       with:
         files_ignore: |
           release-notes/*.md

CHANGELOG-3.0.md

@@ -26,6 +26,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Star Tree] [Search] Resolving keyword & numeric bucket aggregation with metric aggregation using star-tree ([#17165](https://github.com/opensearch-project/OpenSearch/pull/17165))
 - Added error handling support for the pull-based ingestion ([#17427](https://github.com/opensearch-project/OpenSearch/pull/17427))
 - A Java Agent for intercepting socket operation and enforcing a security policy to it.
+- Added Warm index setting and Updated nomenclature to differentiate between hot and warm tiering implementation ([#17490](https://github.com/opensearch-project/OpenSearch/pull/17490))
+
 
 ### Dependencies
 - Update Apache Lucene to 10.1.0 ([#16366](https://github.com/opensearch-project/OpenSearch/pull/16366))
@@ -51,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Use Lucene `BM25Similarity` as default since the `LegacyBM25Similarity` is marked as deprecated ([#17306](https://github.com/opensearch-project/OpenSearch/pull/17306))
 - Wildcard field index only 3gram of the input data [#17349](https://github.com/opensearch-project/OpenSearch/pull/17349)
 - Use BC libraries to parse PEM files, increase key length, allow general use of known cryptographic binary extensions, remove unused BC dependencies ([#3420](https://github.com/opensearch-project/OpenSearch/pull/14912))
+- Add optional enum set read / write functionality to stream input / output ([#17556](https://github.com/opensearch-project/OpenSearch/pull/17556))
 
 ### Deprecated
 

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.api.grpc:proto-google-common-protos` from 2.37.1 to 2.52.0 ([#17379](https://github.com/opensearch-project/OpenSearch/pull/17379))
 - Bump `net.minidev:json-smart` from 2.5.1 to 2.5.2 ([#17378](https://github.com/opensearch-project/OpenSearch/pull/17378))
 - Bump `com.netflix.nebula.ospackage-base` from 11.10.1 to 11.11.1 ([#17374](https://github.com/opensearch-project/OpenSearch/pull/17374))
+- Bump `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17 ([#17497](https://github.com/opensearch-project/OpenSearch/pull/17497))
 - Bump `software.amazon.awssdk` from 2.20.86 to 2.30.31 ([17396](https://github.com/opensearch-project/OpenSearch/pull/17396))
 - Bump `org.jruby.jcodings:jcodings` from 1.0.61 to 1.0.63 ([#17560](https://github.com/opensearch-project/OpenSearch/pull/17560))
 - Bump `com.azure:azure-storage-blob` from 12.28.1 to 12.29.1 ([#17562](https://github.com/opensearch-project/OpenSearch/pull/17562))
@@ -40,10 +41,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Removed
 
 ### Fixed
+- Fix visit of inner query for FunctionScoreQueryBuilder ([#16776](https://github.com/opensearch-project/OpenSearch/pull/16776))
 - Fix case insensitive and escaped query on wildcard ([#16827](https://github.com/opensearch-project/OpenSearch/pull/16827))
 - Fix exists queries on nested flat_object fields throws exception ([#16803](https://github.com/opensearch-project/OpenSearch/pull/16803))
 - Add highlighting for wildcard search on `match_only_text` field ([#17101](https://github.com/opensearch-project/OpenSearch/pull/17101))
 - Fix illegal argument exception when creating a PIT ([#16781](https://github.com/opensearch-project/OpenSearch/pull/16781))
+- Fix NPE in node stats due to QueryGroupTasks ([#17576](https://github.com/opensearch-project/OpenSearch/pull/17576))
 
 ### Security
 

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

@@ -116,7 +116,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_19_0 = new Version(2190099, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1);
-    public static final Version V_2_20_0 = new Version(2200099, org.apache.lucene.util.Version.LUCENE_9_12_1);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0);
     public static final Version CURRENT = V_3_0_0;
 

libs/core/src/main/java/org/opensearch/core/common/io/stream/StreamInput.java

@@ -1305,6 +1305,21 @@ public <E extends Enum<E>> EnumSet<E> readEnumSet(Class<E> enumClass) throws IOE
         return res;
     }
 
+    /**
+     * Reads an optional enum set with type E that was serialized based on the value of each enum's ordinal
+     * The set is expected to have been written using {@link StreamOutput#writeOptionalEnumSet(EnumSet)}
+     *
+     * @return the enum set of strings
+     * @throws IOException if an I/O exception occurs reading the set
+     */
+    public <E extends Enum<E>> EnumSet<E> readOptionalEnumSet(Class<E> enumClass) throws IOException {
+        if (readBoolean()) {
+            return readEnumSet(enumClass);
+        } else {
+            return EnumSet.noneOf(enumClass);
+        }
+    }
+
     public static StreamInput wrap(byte[] bytes) {
         return wrap(bytes, 0, bytes.length);
     }

libs/core/src/main/java/org/opensearch/core/common/io/stream/StreamOutput.java

@@ -1255,6 +1255,19 @@ public <E extends Enum<E>> void writeEnumSet(EnumSet<E> enumSet) throws IOExcept
         }
     }
 
+    /**
+     * Writes an optional EnumSet with type E that serializes each enum based on its ordinal value
+     * For null or empty enum set, writes false;
+     */
+    public <E extends Enum<E>> void writeOptionalEnumSet(@Nullable EnumSet<E> enumSet) throws IOException {
+        if (enumSet != null && enumSet.size() > 0) {
+            writeBoolean(true);
+            writeEnumSet(enumSet);
+        } else {
+            writeBoolean(false);
+        }
+    }
+
     /**
      * Write a {@link TimeValue} to the stream
      */

libs/core/src/test/java/org/opensearch/core/common/io/stream/BaseStreamTests.java

@@ -53,6 +53,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -354,6 +355,32 @@ private <T> void runWriteReadCollectionTest(
         }
     }
 
+    public void testOptionalEnumSet() throws IOException {
+        EnumSet<TestEnum> enumSet = EnumSet.allOf(TestEnum.class);
+        BytesStreamOutput out = new BytesStreamOutput();
+        out.writeOptionalEnumSet(enumSet);
+        EnumSet<TestEnum> targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
+        assertEquals(enumSet, targetSet);
+
+        enumSet = EnumSet.of(TestEnum.A, TestEnum.C, TestEnum.E);
+        out = new BytesStreamOutput();
+        out.writeOptionalEnumSet(enumSet);
+        targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
+        assertEquals(enumSet, targetSet);
+
+        enumSet = EnumSet.noneOf(TestEnum.class);
+        out = new BytesStreamOutput();
+        out.writeOptionalEnumSet(enumSet);
+        targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
+        assertEquals(enumSet, targetSet);
+
+        enumSet = null;
+        out = new BytesStreamOutput();
+        out.writeOptionalEnumSet(enumSet);
+        targetSet = getStreamInput(out.bytes()).readOptionalEnumSet(TestEnum.class);
+        assertEquals(EnumSet.noneOf(TestEnum.class), targetSet);
+    }
+
     public void testSetOfLongs() throws IOException {
         final int size = randomIntBetween(0, 6);
         final Set<Long> sourceSet = new HashSet<>(size);
@@ -540,4 +567,11 @@ private void assertGenericRoundtrip(Object original) throws IOException {
         });
     }
 
+    private enum TestEnum {
+        A,
+        B,
+        C,
+        D,
+        E;
+    }
 }

plugins/repository-s3/build.gradle

@@ -141,6 +141,7 @@ test {
   // this is tested explicitly in separate test tasks
   exclude '**/RepositoryCredentialsTests.class'
   exclude '**/S3RepositoryThirdPartyTests.class'
+  exclude '**/S3RemoteStoreIT.class'
 }
 
 boolean useFixture = false
@@ -252,6 +253,7 @@ processYamlRestTestResources {
 internalClusterTest {
   // this is tested explicitly in a separate test task
   exclude '**/S3RepositoryThirdPartyTests.class'
+  exclude '**/S3RemoteStoreIT.class'
 }
 
 yamlRestTest {
@@ -408,6 +410,7 @@ TaskProvider s3ThirdPartyTest = tasks.register("s3ThirdPartyTest", Test) {
   setTestClassesDirs(internalTestSourceSet.getOutput().getClassesDirs())
   setClasspath(internalTestSourceSet.getRuntimeClasspath())
   include '**/S3RepositoryThirdPartyTests.class'
+  include '**/S3RemoteStoreIT.class'
   systemProperty 'test.s3.account', s3PermanentAccessKey
   systemProperty 'test.s3.key', s3PermanentSecretKey
   systemProperty 'test.s3.bucket', s3PermanentBucket