[GRPC] Upgrade to protobufs 0.24.0 and fix compilation errors (#20059)

Author: karenyrx

CHANGELOG.md

@@ -64,6 +64,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Refactor the IndexPressutreStats, DeviceStats and TransportStats class to use the Builder pattern instead of constructors ([#19991](https://github.com/opensearch-project/OpenSearch/pull/19991))
 - Refactor the Cache.CacheStats class to use the Builder pattern instead of constructors ([#20015](https://github.com/opensearch-project/OpenSearch/pull/20015))
 - Refactor the HttpStats, ScriptStats, AdaptiveSelectionStats and OsStats class to use the Builder pattern instead of constructors ([#20014](https://github.com/opensearch-project/OpenSearch/pull/20014))
+- Bump opensearch-protobufs dependency to 0.24.0 and update transport-grpc module compatibility ([#20059](https://github.com/opensearch-project/OpenSearch/pull/20059))
+
 
 ### Fixed
 - Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))

gradle/libs.versions.toml

@@ -22,7 +22,7 @@ kotlin            = "1.7.10"
 antlr4            = "4.13.1"
 guava             = "33.2.1-jre"
 gson              = "2.13.2"
-opensearchprotobufs = "0.23.0"
+opensearchprotobufs = "0.24.0"
 protobuf          = "3.25.8"
 jakarta_annotation = "1.3.5"
 google_http_client = "1.44.1"

modules/transport-grpc/licenses/protobufs-0.23.0.jar.sha1

@@ -0,0 +1 @@
+4330dd089f853e345aa137708490aec841ffadc0

modules/transport-grpc/licenses/protobufs-0.24.0.jar.sha1

@@ -0,0 +1 @@
+4330dd089f853e345aa137708490aec841ffadc0

modules/transport-grpc/spi/licenses/protobufs-0.23.0.jar.sha1

@@ -45,11 +45,11 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         // Set up source context if source parameters are provided
         if (request.hasXSource()) {
             switch (request.getXSource().getSourceConfigParamCase()) {
-                case BOOL:
-                    fetchSource = request.getXSource().getBool();
+                case FETCH:
+                    fetchSource = request.getXSource().getFetch();
                     break;
-                case STRING_ARRAY:
-                    sourceIncludes = request.getXSource().getStringArray().getStringArrayList().toArray(new String[0]);
+                case FIELDS:
+                    sourceIncludes = request.getXSource().getFields().getStringArrayList().toArray(new String[0]);
                     break;
                 default:
                     throw new UnsupportedOperationException("Invalid sourceConfig provided.");
@@ -84,10 +84,10 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         if (request.hasXSource()) {
             SourceConfigParam source = request.getXSource();
 
-            if (source.hasBool()) {
-                fetchSource = source.getBool();
+            if (source.hasFetch()) {
+                fetchSource = source.getFetch();
             } else {
-                sourceIncludes = source.getStringArray().getStringArrayList().toArray(new String[0]);
+                sourceIncludes = source.getFields().getStringArrayList().toArray(new String[0]);
             }
         }
 

modules/transport-grpc/spi/licenses/protobufs-0.24.0.jar.sha1

@@ -76,7 +76,7 @@ public static Script parseInlineScript(InlineScript inlineScript, String default
 
         ScriptType type = ScriptType.INLINE;
 
-        String lang = parseScriptLanguage(inlineScript.getLang(), defaultLang);
+        String lang = inlineScript.hasLang() ? parseScriptLanguage(inlineScript.getLang(), defaultLang) : defaultLang;
         String idOrCode = inlineScript.getSource();
 
         Map<String, String> options = inlineScript.getOptionsMap();

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java

@@ -38,17 +38,17 @@ private ActiveShardCountProtoUtils() {
     public static ActiveShardCount parseProto(WaitForActiveShards waitForActiveShards) {
 
         switch (waitForActiveShards.getWaitForActiveShardsCase()) {
-            case WAIT_FOR_ACTIVE_SHARD_OPTIONS:
-                switch (waitForActiveShards.getWaitForActiveShardOptions()) {
+            case OPTION:
+                switch (waitForActiveShards.getOption()) {
                     case WAIT_FOR_ACTIVE_SHARD_OPTIONS_ALL:
                         return ActiveShardCount.ALL;
                     case WAIT_FOR_ACTIVE_SHARD_OPTIONS_NULL:
                     case WAIT_FOR_ACTIVE_SHARD_OPTIONS_UNSPECIFIED:
                     default:
                         return ActiveShardCount.DEFAULT;
                 }
-            case INT32:
-                return ActiveShardCount.from(waitForActiveShards.getInt32());
+            case COUNT:
+                return ActiveShardCount.from(waitForActiveShards.getCount());
             case WAITFORACTIVESHARDS_NOT_SET:
             default:
                 return ActiveShardCount.DEFAULT;

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/ScriptProtoUtils.java

@@ -0,0 +1,68 @@
+/*
+ * 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.transport.grpc.proto.request.search;
+
+import org.opensearch.index.mapper.DerivedField;
+import org.opensearch.transport.grpc.proto.request.common.ObjectMapProtoUtils;
+import org.opensearch.transport.grpc.proto.request.common.ScriptProtoUtils;
+
+/**
+ * Utility class for converting DerivedField Protocol Buffers to OpenSearch DerivedField objects.
+ * This class handles the conversion of Protocol Buffer representations to their
+ * corresponding OpenSearch derived field objects, matching the REST side pattern.
+ *
+ * @see org.opensearch.index.mapper.DerivedFieldMapper.Builder#build(org.opensearch.index.mapper.Mapper.BuilderContext)
+ * @see org.opensearch.index.mapper.DefaultDerivedFieldResolver#initDerivedFieldTypes(java.util.Map, java.util.List)
+ */
+public class DerivedFieldProtoUtils {
+
+    private DerivedFieldProtoUtils() {
+        // Utility class, no instances
+    }
+
+    /**
+     * Converts a Protocol Buffer DerivedField to its corresponding OpenSearch DerivedField.
+     * Uses the same pattern as REST side: always use simple constructor, then conditionally
+     * set optional fields based on presence (matches DerivedFieldMapper.Builder.build() pattern).
+     *
+     *
+     * <p>This matches the REST side's {@code Parameter.isConfigured()} pattern in
+     * {@link org.opensearch.index.mapper.DerivedFieldMapper.Builder#build}, where optional
+     * fields are only set if they were present in the request.</p>
+     *
+     * @param name The name of the derived field
+     * @param derivedFieldProto The Protocol Buffer DerivedField to convert
+     * @return The corresponding OpenSearch DerivedField with optional fields set
+     * @see org.opensearch.index.mapper.DerivedFieldMapper.Builder#build(org.opensearch.index.mapper.Mapper.BuilderContext)
+     * @see org.opensearch.index.mapper.ParametrizedFieldMapper.Parameter#isConfigured()
+     */
+    public static DerivedField fromProto(String name, org.opensearch.protobufs.DerivedField derivedFieldProto) {
+        // Always use simple constructor first (matches REST side pattern in DerivedFieldMapper.Builder.build())
+        DerivedField derivedField = new DerivedField(
+            name,
+            derivedFieldProto.getType(),
+            ScriptProtoUtils.parseFromProtoRequest(derivedFieldProto.getScript())
+        );
+
+        // Conditionally set optional fields based on presence (matches REST side's isConfigured() pattern)
+        if (derivedFieldProto.hasProperties()) {
+            derivedField.setProperties(ObjectMapProtoUtils.fromProto(derivedFieldProto.getProperties()));
+        }
+        if (derivedFieldProto.hasPrefilterField()) {
+            derivedField.setPrefilterField(derivedFieldProto.getPrefilterField());
+        }
+        if (derivedFieldProto.hasFormat()) {
+            derivedField.setFormat(derivedFieldProto.getFormat());
+        }
+        if (derivedFieldProto.hasIgnoreMalformed()) {
+            derivedField.setIgnoreMalformed(derivedFieldProto.getIgnoreMalformed());
+        }
+
+        return derivedField;
+    }
+}