[GRPC] Adapt transport-grpc to use opensearch-protobufs 0.13.0 (#19007)

* Upgrade opensearch-protobufs dependency to 0.7.0 and update transport-grpc module compatibility

- Upgrade protobufs dependency from 0.6.0 to 0.7.0 in transport-grpc module
- Update all protobuf utility classes to handle API changes in 0.7.0
- Fix enum structure changes (simple enums to message with oneof fields)
- Update field name changes (setIndex -> setUnderscoreIndex, etc.)
- Handle new OperationContainer pattern for bulk operations
- Update all corresponding unit and integration tests
- Add new SHA for protobufs-0.7.0.jar and remove old 0.6.0 SHA

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

* Use 0.8.0 protos and fix transport-grpc compilation errors

Signed-off-by: Karen Xu <[email protected]>

* Add unit tests to improve transport-grpc module coverage

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

* Improve test coverage for search query utilities

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

* Improve unit test coverage for search query utilities

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

* transport-grpc: update to opensearch-protobufs 0.9.0 and improve FieldValue handling

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

* Update transport-grpc to opensearch-protobufs 0.10.0-SNAPSHOT

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

* use 0.10.0

Signed-off-by: Karen Xu <[email protected]>

* remove map and refactor fieldvalueprotoutils.fromproto
fix InnerHitBuilderProtoUtils
tests

Signed-off-by: Karen Xu <[email protected]>

* forgot to commit spotlessApply changes

Signed-off-by: Karen Xu <[email protected]>

* update to 0.12.0 protos

Signed-off-by: Karen Xu <[email protected]>

* fix compilation

Signed-off-by: Karen Xu <[email protected]>

* use 0.13.0

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

---------

Signed-off-by: sakrah <[email protected]>
Signed-off-by: Karen Xu <[email protected]>
Signed-off-by: Karen X <[email protected]>
Signed-off-by: karenx <[email protected]>
Co-authored-by: sakrah <[email protected]>
Co-authored-by: karenx <[email protected]>

Author: 3 people

CHANGELOG.md

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Support system generated search pipeline. ([#19128](https://github.com/opensearch-project/OpenSearch/pull/19128))
 - Add `epoch_micros` date format ([#14669](https://github.com/opensearch-project/OpenSearch/issues/14669))
 - Grok processor supports capturing multiple values for same field name ([#18799](https://github.com/opensearch-project/OpenSearch/pull/18799)
+- Upgrade opensearch-protobufs dependency to 0.13.0 and update transport-grpc module compatibility ([#19007](https://github.com/opensearch-project/OpenSearch/issues/19007))
 
 ### Changed
 - Refactor `if-else` chains to use `Java 17 pattern matching switch expressions`(([#18965](https://github.com/opensearch-project/OpenSearch/pull/18965))

gradle/libs.versions.toml

@@ -21,7 +21,7 @@ woodstox          = "6.4.0"
 kotlin            = "1.7.10"
 antlr4            = "4.13.1"
 guava             = "33.2.1-jre"
-opensearchprotobufs = "0.6.0"
+opensearchprotobufs = "0.13.0"
 protobuf          = "3.25.8"
 jakarta_annotation = "1.3.5"
 google_http_client = "1.44.1"

modules/transport-grpc/build.gradle

@@ -35,7 +35,7 @@ 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.6.0"
+  implementation "org.opensearch:protobufs:${versions.opensearchprotobufs}"
   testImplementation project(':test:framework')
 }
 

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

@@ -0,0 +1 @@
+14c2a9be2d5e309d7511f734fd43d7d2077db4da

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

@@ -0,0 +1 @@
+14c2a9be2d5e309d7511f734fd43d7d2077db4da

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

@@ -89,7 +89,7 @@ private QueryContainer createMockTermQueryContainer() {
             .setTerm(
                 org.opensearch.protobufs.TermQuery.newBuilder()
                     .setField("test_field")
-                    .setValue(org.opensearch.protobufs.FieldValue.newBuilder().setStringValue("test_value").build())
+                    .setValue(org.opensearch.protobufs.FieldValue.newBuilder().setString("test_value").build())
                     .build()
             )
             .build();
@@ -144,8 +144,8 @@ public QueryBuilder fromProto(QueryContainer queryContainer) {
             org.opensearch.protobufs.FieldValue fieldValue = termQuery.getValue();
             Object value;
 
-            if (fieldValue.hasStringValue()) {
-                value = fieldValue.getStringValue();
+            if (fieldValue.hasString()) {
+                value = fieldValue.getString();
             } else if (fieldValue.hasGeneralNumber()) {
                 org.opensearch.protobufs.GeneralNumber number = fieldValue.getGeneralNumber();
                 if (number.hasFloatValue()) {
@@ -159,8 +159,8 @@ public QueryBuilder fromProto(QueryContainer queryContainer) {
                 } else {
                     throw new IllegalArgumentException("Unsupported number type in TermQuery");
                 }
-            } else if (fieldValue.hasBoolValue()) {
-                value = fieldValue.getBoolValue();
+            } else if (fieldValue.hasBool()) {
+                value = fieldValue.getBool();
             } else {
                 throw new IllegalArgumentException("Unsupported field value type in TermQuery");
             }

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

@@ -37,11 +37,11 @@ public void testDocumentServiceBulk() throws Exception {
             DocumentServiceGrpc.DocumentServiceBlockingStub documentStub = DocumentServiceGrpc.newBlockingStub(channel);
 
             // Create a bulk request with an index operation
-            IndexOperation indexOp = IndexOperation.newBuilder().setIndex(indexName).setId("1").build();
+            IndexOperation indexOp = IndexOperation.newBuilder().setXIndex(indexName).setXId("1").build();
 
             BulkRequestBody requestBody = BulkRequestBody.newBuilder()
-                .setIndex(indexOp)
-                .setDoc(com.google.protobuf.ByteString.copyFromUtf8(DEFAULT_DOCUMENT_SOURCE))
+                .setOperationContainer(org.opensearch.protobufs.OperationContainer.newBuilder().setIndex(indexOp).build())
+                .setObject(com.google.protobuf.ByteString.copyFromUtf8(DEFAULT_DOCUMENT_SOURCE))
                 .build();
 
             BulkRequest bulkRequest = BulkRequest.newBuilder().addRequestBody(requestBody).build();
@@ -51,8 +51,8 @@ public void testDocumentServiceBulk() throws Exception {
 
             // Verify the response
             assertNotNull("Bulk response should not be null", bulkResponse);
-            assertFalse("Bulk response should not have errors", bulkResponse.getBulkResponseBody().getErrors());
-            assertEquals("Bulk response should have one item", 1, bulkResponse.getBulkResponseBody().getItemsCount());
+            assertFalse("Bulk response should not have errors", bulkResponse.getErrors());
+            assertEquals("Bulk response should have one item", 1, bulkResponse.getItemsCount());
 
             // Verify the document is searchable
             waitForSearchableDoc(indexName, "1");

modules/transport-grpc/spi/src/test/java/org/opensearch/transport/grpc/spi/QueryBuilderProtoConverterTests.java

@@ -52,12 +52,9 @@ public void testSearchServiceSearch() throws Exception {
 
             // Verify the response
             assertNotNull("Search response should not be null", searchResponse);
-            assertTrue(
-                "Search response should have hits",
-                searchResponse.getResponseBody().getHits().getTotal().getTotalHits().getValue() > 0
-            );
-            assertEquals("Search response should have one hit", 1, searchResponse.getResponseBody().getHits().getHitsCount());
-            assertEquals("Hit should have correct ID", "1", searchResponse.getResponseBody().getHits().getHits(0).getId());
+            assertTrue("Search response should have hits", searchResponse.getHits().getTotal().getTotalHits().getValue() > 0);
+            assertEquals("Search response should have one hit", 1, searchResponse.getHits().getHitsCount());
+            assertEquals("Hit should have correct ID", "1", searchResponse.getHits().getHits(0).getXId());
         }
     }
 }