Skip to content

[GRPC] bump org.opensearch.protobufs to 0.23.0 and fix compilation errors #19831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karenyrx merged 2 commits into from
Oct 31, 2025
Merged

[GRPC] bump org.opensearch.protobufs to 0.23.0 and fix compilation errors #19831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
044f330
[GRPC] Compile with protobuf 0.23.0
lucy66hw Oct 8, 2025
d83a0f1
Add changelog
lucy66hw Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Remove FeatureFlag.MERGED_SEGMENT_WARMER_EXPERIMENTAL_FLAG. ([#19715](https://github.com/opensearch-project/OpenSearch/pull/19715))
- Change the default value of doc_values in WildcardFieldMapper to true. ([#19796](https://github.com/opensearch-project/OpenSearch/pull/19796))
- Make Engine#loadHistoryUUID() protected and Origin#isFromTranslog() public ([#19753](https://github.com/opensearch-project/OpenSearch/pull/19752))
- Bump opensearch-protobufs dependency to 0.23.0 and update transport-grpc module compatibility ([#19831](https://github.com/opensearch-project/OpenSearch/pull/19831))

### Fixed
- Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ kotlin = "1.7.10"
antlr4 = "4.13.1"
guava = "33.2.1-jre"
gson = "2.13.2"
opensearchprotobufs = "0.19.0"
opensearchprotobufs = "0.23.0"
protobuf = "3.25.8"
jakarta_annotation = "1.3.5"
google_http_client = "1.44.1"
Expand Down
1 change: 0 additions & 1 deletion modules/transport-grpc/licenses/protobufs-0.19.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-grpc/licenses/protobufs-0.23.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ebcc741fa7ddec2f1ecc6037fb6935676a250c31
1 change: 0 additions & 1 deletion modules/transport-grpc/spi/licenses/protobufs-0.19.0.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-grpc/spi/licenses/protobufs-0.23.0.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ebcc741fa7ddec2f1ecc6037fb6935676a250c31
5 changes: 1 addition & 4 deletions ...rt-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/DocumentServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,13 @@ public void testDocumentServiceBulk() throws Exception {
.setObject(com.google.protobuf.ByteString.copyFromUtf8(DEFAULT_DOCUMENT_SOURCE))
.build();

BulkRequest bulkRequest = BulkRequest.newBuilder().addRequestBody(requestBody).build();
BulkRequest bulkRequest = BulkRequest.newBuilder().addBulkRequestBody(requestBody).build();

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

// Verify the response
assertNotNull("Bulk response should not be null", bulkResponse);
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");
}
Expand Down
2 changes: 1 addition & 1 deletion ...port-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/SearchServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void testSearchServiceSearch() throws Exception {

SearchRequest searchRequest = SearchRequest.newBuilder()
.addIndex(indexName)
.setRequestBody(requestBody)
.setSearchRequestBody(requestBody)
.setQ("field1:value1")
.build();

Expand Down
2 changes: 1 addition & 1 deletion ...rg/opensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public static DocWriteRequest<?>[] getDocWriteRequests(
String defaultPipeline,
Boolean defaultRequireAlias
) {
List<BulkRequestBody> bulkRequestBodyList = request.getRequestBodyList();
List<BulkRequestBody> bulkRequestBodyList = request.getBulkRequestBodyList();
DocWriteRequest<?>[] docWriteRequests = new DocWriteRequest<?>[bulkRequestBodyList.size()];

// Process each operation in the request body
Expand Down
2 changes: 0 additions & 2 deletions .../main/java/org/opensearch/transport/grpc/proto/request/search/ProtoActionsProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ protected static QueryBuilder urlParamsToQueryBuilder(SearchRequest request) {

QueryStringQueryBuilder queryBuilder = QueryBuilders.queryStringQuery(request.getQ());
queryBuilder.defaultField(request.hasDf() ? request.getDf() : null);
queryBuilder.analyzer(request.hasAnalyzer() ? request.getAnalyzer() : null);
queryBuilder.analyzeWildcard(request.hasAnalyzeWildcard() ? request.getAnalyzeWildcard() : false);
queryBuilder.lenient(request.hasLenient() ? request.getLenient() : null);
if (request.hasDefaultOperator()) {
queryBuilder.defaultOperator(OperatorProtoUtils.fromEnum(request.getDefaultOperator()));
}
Expand Down
65 changes: 2 additions & 63 deletions ...main/java/org/opensearch/transport/grpc/proto/request/search/SearchRequestProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
import org.opensearch.index.query.QueryBuilder;
import org.opensearch.protobufs.SearchRequest;
import org.opensearch.protobufs.SearchRequestBody;
import org.opensearch.protobufs.TrackHits;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.action.search.RestSearchAction;
import org.opensearch.search.Scroll;
import org.opensearch.search.builder.SearchSourceBuilder;
import org.opensearch.search.fetch.StoredFieldsContext;
import org.opensearch.search.fetch.subphase.FetchSourceContext;
import org.opensearch.search.internal.SearchContext;
import org.opensearch.search.suggest.SuggestBuilder;
Expand Down Expand Up @@ -115,7 +113,7 @@ protected static void parseSearchRequest(
}
searchRequest.indices(indexArr);

SearchSourceBuilderProtoUtils.parseProto(searchRequest.source(), request.getRequestBody(), queryUtils);
SearchSourceBuilderProtoUtils.parseProto(searchRequest.source(), request.getSearchRequestBody(), queryUtils);

final int batchedReduceSize = request.hasBatchedReduceSize()
? request.getBatchedReduceSize()
Expand Down Expand Up @@ -166,7 +164,6 @@ protected static void parseSearchRequest(
}
searchRequest.preference(request.hasPreference() ? request.getPreference() : null);
searchRequest.indicesOptions(IndicesOptionsProtoUtils.fromRequest(request, searchRequest.indicesOptions()));
searchRequest.pipeline(request.hasSearchPipeline() ? request.getSearchPipeline() : searchRequest.source().pipeline());

checkProtoTotalHits(request, searchRequest);

Expand Down Expand Up @@ -205,45 +202,7 @@ protected static void parseSearchSource(
if (queryBuilder != null) {
searchSourceBuilder.query(queryBuilder);
}
if (request.hasFrom()) {
searchSourceBuilder.from(request.getFrom());
}
if (request.hasSize()) {
setSize.accept(request.getSize());
}

if (request.hasExplain()) {
searchSourceBuilder.explain(request.getExplain());
}

if (request.hasVersion()) {
searchSourceBuilder.version(request.getVersion());
}

if (request.hasSeqNoPrimaryTerm()) {
searchSourceBuilder.seqNoAndPrimaryTerm(request.getSeqNoPrimaryTerm());
}

if (request.hasTimeout()) {
searchSourceBuilder.timeout(parseTimeValue(request.getTimeout(), null, "timeout"));
}

if (request.hasVerbosePipeline()) {
searchSourceBuilder.verbosePipeline(request.getVerbosePipeline());
}

if (request.hasTerminateAfter()) {
int terminateAfter = request.getTerminateAfter();
if (terminateAfter < 0) {
throw new IllegalArgumentException("terminateAfter must be > 0");
} else if (terminateAfter > 0) {
searchSourceBuilder.terminateAfter(terminateAfter);
}
}
StoredFieldsContext storedFieldsContext = StoredFieldsContextProtoUtils.fromProtoRequest(request);
if (storedFieldsContext != null) {
searchSourceBuilder.storedFields(storedFieldsContext);
}
if (request.getDocvalueFieldsCount() > 0) {
for (String field : request.getDocvalueFieldsList()) {
searchSourceBuilder.docValueField(field, null);
Expand All @@ -254,26 +213,6 @@ protected static void parseSearchSource(
searchSourceBuilder.fetchSource(fetchSourceContext);
}

if (request.hasTrackScores()) {
searchSourceBuilder.trackScores(request.getTrackScores());
}

if (request.hasIncludeNamedQueriesScore()) {
searchSourceBuilder.includeNamedQueriesScores(request.getIncludeNamedQueriesScore());
}

if (request.hasTrackTotalHits()) {
if (request.getTrackTotalHits().getTrackHitsCase() == TrackHits.TrackHitsCase.ENABLED) {
searchSourceBuilder.trackTotalHits(request.getTrackTotalHits().getEnabled());
} else if (request.getTrackTotalHits().getTrackHitsCase() == TrackHits.TrackHitsCase.COUNT) {
searchSourceBuilder.trackTotalHitsUpTo(request.getTrackTotalHits().getCount());
}
}

if (request.getStatsCount() > 0) {
searchSourceBuilder.stats(request.getStatsList());
}

if (request.hasSuggestField()) {
String suggestField = request.getSuggestField();
String suggestText = request.hasSuggestText() ? request.getSuggestText() : request.getQ();
Expand Down Expand Up @@ -348,7 +287,7 @@ private static void preparePointInTime(
*/
protected static void checkProtoTotalHits(SearchRequest protoRequest, org.opensearch.action.search.SearchRequest searchRequest) {

boolean totalHitsAsInt = protoRequest.hasRestTotalHitsAsInt() ? protoRequest.getRestTotalHitsAsInt() : false;
boolean totalHitsAsInt = protoRequest.hasTotalHitsAsInt() ? protoRequest.getTotalHitsAsInt() : false;
if (totalHitsAsInt == false) {
return;
}
Expand Down
9 changes: 2 additions & 7 deletions ...ava/org/opensearch/transport/grpc/proto/request/search/SearchSourceBuilderProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,8 @@ private static void parseNonQueryFields(SearchSourceBuilder searchSourceBuilder,
}
}
if (protoRequest.getIndicesBoostCount() > 0) {
/**
* Similar to {@link SearchSourceBuilder.IndexBoost#IndexBoost(XContentParser)}
*/
for (org.opensearch.protobufs.FloatMap floatMap : protoRequest.getIndicesBoostList()) {
for (Map.Entry<String, Float> entry : floatMap.getFloatMapMap().entrySet()) {
searchSourceBuilder.indexBoost(entry.getKey(), entry.getValue());
}
for (Map.Entry<String, Float> entry : protoRequest.getIndicesBoostMap().entrySet()) {
searchSourceBuilder.indexBoost(entry.getKey(), entry.getValue());
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/opensearch/transport/grpc/proto/request/search/StoredFieldsContextProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected static StoredFieldsContext fromProto(List<String> storedFields) throws
* @param request the Protocol Buffer SearchRequest
* @return a StoredFieldsContext
*/
protected static StoredFieldsContext fromProtoRequest(org.opensearch.protobufs.SearchRequest request) {
protected static StoredFieldsContext fromProtoRequest(org.opensearch.protobufs.SearchRequestBody request) {
if (request.getStoredFieldsCount() > 0) {
return StoredFieldsContext.fromList(request.getStoredFieldsList());
}
Expand Down
12 changes: 6 additions & 6 deletions ...ensearch/transport/grpc/proto/request/document/bulk/BulkRequestParserProtoUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ public void testGetDocWriteRequests() {
.build();

BulkRequest request = BulkRequest.newBuilder()
.addRequestBody(indexBody)
.addRequestBody(createBody)
.addRequestBody(updateBody)
.addRequestBody(deleteBody)
.addBulkRequestBody(indexBody)
.addBulkRequestBody(createBody)
.addBulkRequestBody(updateBody)
.addBulkRequestBody(deleteBody)
.build();

DocWriteRequest<?>[] requests = BulkRequestParserProtoUtils.getDocWriteRequests(
Expand Down Expand Up @@ -291,7 +291,7 @@ public void testGetDocWriteRequests() {
public void testGetDocWriteRequestsWithInvalidOperation() {
BulkRequestBody invalidBody = BulkRequestBody.newBuilder().build();

BulkRequest request = BulkRequest.newBuilder().addRequestBody(invalidBody).build();
BulkRequest request = BulkRequest.newBuilder().addBulkRequestBody(invalidBody).build();

expectThrows(
IllegalArgumentException.class,
Expand Down Expand Up @@ -630,7 +630,7 @@ public void testGetDocWriteRequestsWithGlobalValues() {
.build();

BulkRequest request = BulkRequest.newBuilder()
.addRequestBody(indexBody)
.addBulkRequestBody(indexBody)
.setRouting("global-routing")
.setPipeline("global-pipeline")
.setRequireAlias(true)
Expand Down
Loading
Loading