Skip to content

Commit 72e9768

Browse files
authored
[GRPC] bump org.opensearch.protobufs to 0.23.0 and fix compilation errors (#19831)
* [GRPC] Compile with protobuf 0.23.0 Signed-off-by: xil <[email protected]> * Add changelog Signed-off-by: xil <[email protected]> --------- Signed-off-by: xil <[email protected]>
1 parent 0a77be1 commit 72e9768

File tree

20 files changed

+109
-154
lines changed

20 files changed

+109
-154
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3434
- Remove FeatureFlag.MERGED_SEGMENT_WARMER_EXPERIMENTAL_FLAG. ([#19715](https://github.com/opensearch-project/OpenSearch/pull/19715))
3535
- Change the default value of doc_values in WildcardFieldMapper to true. ([#19796](https://github.com/opensearch-project/OpenSearch/pull/19796))
3636
- Make Engine#loadHistoryUUID() protected and Origin#isFromTranslog() public ([#19753](https://github.com/opensearch-project/OpenSearch/pull/19752))
37+
- Bump opensearch-protobufs dependency to 0.23.0 and update transport-grpc module compatibility ([#19831](https://github.com/opensearch-project/OpenSearch/pull/19831))
3738

3839
### Fixed
3940
- Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ kotlin = "1.7.10"
2222
antlr4 = "4.13.1"
2323
guava = "33.2.1-jre"
2424
gson = "2.13.2"
25-
opensearchprotobufs = "0.19.0"
25+
opensearchprotobufs = "0.23.0"
2626
protobuf = "3.25.8"
2727
jakarta_annotation = "1.3.5"
2828
google_http_client = "1.44.1"

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ebcc741fa7ddec2f1ecc6037fb6935676a250c31

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

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ebcc741fa7ddec2f1ecc6037fb6935676a250c31

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/DocumentServiceIT.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,13 @@ public void testDocumentServiceBulk() throws Exception {
4444
.setObject(com.google.protobuf.ByteString.copyFromUtf8(DEFAULT_DOCUMENT_SOURCE))
4545
.build();
4646

47-
BulkRequest bulkRequest = BulkRequest.newBuilder().addRequestBody(requestBody).build();
47+
BulkRequest bulkRequest = BulkRequest.newBuilder().addBulkRequestBody(requestBody).build();
4848

4949
// Execute the bulk request
5050
BulkResponse bulkResponse = documentStub.bulk(bulkRequest);
5151

5252
// Verify the response
5353
assertNotNull("Bulk response should not be null", bulkResponse);
54-
assertFalse("Bulk response should not have errors", bulkResponse.getErrors());
55-
assertEquals("Bulk response should have one item", 1, bulkResponse.getItemsCount());
56-
5754
// Verify the document is searchable
5855
waitForSearchableDoc(indexName, "1");
5956
}

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/SearchServiceIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void testSearchServiceSearch() throws Exception {
4343

4444
SearchRequest searchRequest = SearchRequest.newBuilder()
4545
.addIndex(indexName)
46-
.setRequestBody(requestBody)
46+
.setSearchRequestBody(requestBody)
4747
.setQ("field1:value1")
4848
.build();
4949

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
116116
String defaultPipeline,
117117
Boolean defaultRequireAlias
118118
) {
119-
List<BulkRequestBody> bulkRequestBodyList = request.getRequestBodyList();
119+
List<BulkRequestBody> bulkRequestBodyList = request.getBulkRequestBodyList();
120120
DocWriteRequest<?>[] docWriteRequests = new DocWriteRequest<?>[bulkRequestBodyList.size()];
121121

122122
// Process each operation in the request body

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ protected static QueryBuilder urlParamsToQueryBuilder(SearchRequest request) {
3939

4040
QueryStringQueryBuilder queryBuilder = QueryBuilders.queryStringQuery(request.getQ());
4141
queryBuilder.defaultField(request.hasDf() ? request.getDf() : null);
42-
queryBuilder.analyzer(request.hasAnalyzer() ? request.getAnalyzer() : null);
4342
queryBuilder.analyzeWildcard(request.hasAnalyzeWildcard() ? request.getAnalyzeWildcard() : false);
44-
queryBuilder.lenient(request.hasLenient() ? request.getLenient() : null);
4543
if (request.hasDefaultOperator()) {
4644
queryBuilder.defaultOperator(OperatorProtoUtils.fromEnum(request.getDefaultOperator()));
4745
}

0 commit comments

Comments
 (0)