Use 0.8.0 protos and fix search and bulk protos

Signed-off-by: Karen Xu <karenxyr@gmail.com>

Author: karenyrx

CHANGELOG.md

@@ -5,7 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased 3.x]
 ### Added
-- Upgrade opensearch-protobufs dependency to 0.7.0 and update transport-grpc module compatibility
+* Upgrade opensearch-protobufs dependency to 0.7.0 and update transport-grpc module compatibility ([#19003](https://github.com/opensearch-project/OpenSearch/issues/19003))
+* Upgrade opensearch-protobufs dependency to 0.8.0 and update transport-grpc module compatibility ([#19007](https://github.com/opensearch-project/OpenSearch/issues/19007))
+
 
 ### Changed
 

modules/transport-grpc/build.gradle

@@ -34,10 +34,16 @@ dependencies {
   implementation "io.grpc:grpc-stub:${versions.grpc}"
   implementation "io.grpc:grpc-util:${versions.grpc}"
   implementation "io.perfmark:perfmark-api:0.27.0"
-  implementation "org.opensearch:protobufs:0.7.0"
+  implementation "org.opensearch:protobufs:0.8.0-SNAPSHOT"
   testImplementation project(':test:framework')
 }
 
+repositories {
+  maven {
+    url = 'https://central.sonatype.com/repository/maven-snapshots/'
+  }
+}
+
 tasks.named("dependencyLicenses").configure {
   mapping from: /grpc-.*/, to: 'grpc'
 }

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

@@ -81,8 +81,8 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         String[] sourceExcludes = null;
         String[] sourceIncludes = null;
 
-        if (request.hasSource()) {
-            SourceConfigParam source = request.getSource();
+        if (request.hasUnderscoreSource()) {
+            SourceConfigParam source = request.getUnderscoreSource();
 
             if (source.hasBoolValue()) {
                 fetchSource = source.getBoolValue();
@@ -91,12 +91,12 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
             }
         }
 
-        if (request.getSourceIncludesCount() > 0) {
-            sourceIncludes = request.getSourceIncludesList().toArray(new String[0]);
+        if (request.getUnderscoreSourceIncludesCount() > 0) {
+            sourceIncludes = request.getUnderscoreSourceIncludesList().toArray(new String[0]);
         }
 
-        if (request.getSourceExcludesCount() > 0) {
-            sourceExcludes = request.getSourceExcludesList().toArray(new String[0]);
+        if (request.getUnderscoreSourceExcludesCount() > 0) {
+            sourceExcludes = request.getUnderscoreSourceExcludesList().toArray(new String[0]);
         }
 
         if (fetchSource != null || sourceIncludes != null || sourceExcludes != null) {

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

@@ -32,12 +32,12 @@ private OpTypeProtoUtils() {
      */
     public static DocWriteRequest.OpType fromProto(OpType opType) {
 
-        switch (opType.getOpTypeCase()) {
+        switch (opType) {
             case OP_TYPE_CREATE:
                 return DocWriteRequest.OpType.CREATE;
             case OP_TYPE_INDEX:
                 return DocWriteRequest.OpType.INDEX;
-            case OPTYPE_NOT_SET:
+            case OP_TYPE_UNSPECIFIED:
             default:
                 throw new UnsupportedOperationException("Invalid optype: " + opType);
         }

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

@@ -30,13 +30,14 @@ private RefreshProtoUtils() {
      * @return The corresponding OpenSearch refresh policy string value
      */
     public static String getRefreshPolicy(org.opensearch.protobufs.Refresh refresh) {
-        switch (refresh.getRefreshCase()) {
+        switch (refresh) {
             case REFRESH_TRUE:
                 return WriteRequest.RefreshPolicy.IMMEDIATE.getValue();
             case REFRESH_WAIT_FOR:
                 return WriteRequest.RefreshPolicy.WAIT_UNTIL.getValue();
             case REFRESH_FALSE:
-            case REFRESH_NOT_SET:
+            case REFRESH_BOOLEAN:
+            case REFRESH_UNSPECIFIED:
             default:
                 return WriteRequest.RefreshPolicy.NONE.getValue();
         }

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java

@@ -39,11 +39,11 @@ public static ActiveShardCount parseProto(WaitForActiveShards waitForActiveShard
 
         switch (waitForActiveShards.getWaitForActiveShardsCase()) {
             case WAIT_FOR_ACTIVE_SHARD_OPTIONS:
-                switch (waitForActiveShards.getWaitForActiveShardOptions().getWaitForActiveShardOptionsCase()) {
+                switch (waitForActiveShards.getWaitForActiveShardOptions()) {
                     case WAIT_FOR_ACTIVE_SHARD_OPTIONS_ALL:
                         return ActiveShardCount.ALL;
-                    case NULL_VALUE:
-                    case WAITFORACTIVESHARDOPTIONS_NOT_SET:
+                    case WAIT_FOR_ACTIVE_SHARD_OPTIONS_NULL:
+                    case WAIT_FOR_ACTIVE_SHARD_OPTIONS_UNSPECIFIED:
                     default:
                         return ActiveShardCount.DEFAULT;
                 }

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java

@@ -304,7 +304,7 @@ public static IndexRequest buildIndexRequest(
                 .routing(routing)
                 .version(version)
                 .versionType(versionType)
-                .create(opType.getOpTypeCase() == OpType.OpTypeCase.OP_TYPE_CREATE)
+                .create(opType == OpType.OP_TYPE_CREATE)
                 .setPipeline(pipeline)
                 .setIfSeqNo(ifSeqNo)
                 .setIfPrimaryTerm(ifPrimaryTerm)

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/search/IndicesOptionsProtoUtils.java

@@ -88,15 +88,15 @@ protected static IndicesOptions fromProtoParameters(SearchRequest request, Indic
      * @return an EnumSet of WildcardStates based on the provided wildcardList
      */
     protected static EnumSet<IndicesOptions.WildcardStates> parseProtoParameter(
-        List<SearchRequest.ExpandWildcard> wildcardList,
+        List<org.opensearch.protobufs.ExpandWildcard> wildcardList,
         EnumSet<IndicesOptions.WildcardStates> defaultStates
     ) {
         if (wildcardList.isEmpty()) {
             return defaultStates;
         }
 
         EnumSet<IndicesOptions.WildcardStates> states = EnumSet.noneOf(IndicesOptions.WildcardStates.class);
-        for (SearchRequest.ExpandWildcard wildcard : wildcardList) {
+        for (org.opensearch.protobufs.ExpandWildcard wildcard : wildcardList) {
             updateSetForValue(states, wildcard);
         }
 
@@ -110,7 +110,7 @@ protected static EnumSet<IndicesOptions.WildcardStates> parseProtoParameter(
      * @param states the EnumSet of WildcardStates to update
      * @param wildcard the ExpandWildcard value to use for updating the states
      */
-    protected static void updateSetForValue(EnumSet<IndicesOptions.WildcardStates> states, SearchRequest.ExpandWildcard wildcard) {
+    protected static void updateSetForValue(EnumSet<IndicesOptions.WildcardStates> states, org.opensearch.protobufs.ExpandWildcard wildcard) {
         switch (wildcard) {
             case EXPAND_WILDCARD_OPEN:
                 states.add(OPEN);

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/search/InnerHitsBuilderProtoUtils.java

@@ -79,8 +79,9 @@ protected static InnerHitBuilder fromProto(List<InnerHits> innerHits) throws IOE
             }
             if (innerHit.getFieldsCount() > 0) {
                 List<FieldAndFormat> fieldAndFormatList = new ArrayList<>();
-                for (org.opensearch.protobufs.FieldAndFormat fieldAndFormat : innerHit.getFieldsList()) {
-                    fieldAndFormatList.add(FieldAndFormatProtoUtils.fromProto(fieldAndFormat));
+                for (String fieldName : innerHit.getFieldsList()) {
+                    // Convert string field names to FieldAndFormat objects
+                    fieldAndFormatList.add(new FieldAndFormat(fieldName, null));
                 }
                 innerHitBuilder.setFetchFields(fieldAndFormatList);
             }

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/search/OperatorProtoUtils.java

@@ -26,7 +26,7 @@ private OperatorProtoUtils() {
      * @param op
      * @return
      */
-    protected static Operator fromEnum(org.opensearch.protobufs.SearchRequest.Operator op) {
+    protected static Operator fromEnum(org.opensearch.protobufs.Operator op) {
         switch (op) {
             case OPERATOR_AND:
                 return Operator.AND;