Skip to content

[GRPC] Specify SourceContentType in search hits #19751

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+35 −0
Draft

[GRPC] Specify SourceContentType in search hits #19751

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4faa9
[GRPC] Specify SourceContentType in search hits
karenyrx Oct 23, 2025
f2a6b8d
Merge remote-tracking branch 'ossupstream/main' into searchBinary
karenyrx Oct 24, 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
35 changes: 35 additions & 0 deletions ...rc/main/java/org/opensearch/transport/grpc/proto/response/search/SearchHitProtoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,34 @@ private static void processMetadataFields(SearchHit hit, org.opensearch.protobuf
}
}

/**
* Maps OpenSearch MediaType to protobuf SourceContentType enum.
*
* @param mediaType The MediaType to map
* @return The corresponding SourceContentType enum value
*/
private static org.opensearch.protobufs.SourceContentType mapMediaTypeToProtoEnum(
org.opensearch.core.xcontent.MediaType mediaType
) {
String format = mediaType.format();
if (format == null) {
return org.opensearch.protobufs.SourceContentType.SOURCE_CONTENT_TYPE_UNSPECIFIED;
}

switch (format.toLowerCase()) {
case "json":
return org.opensearch.protobufs.SourceContentType.SOURCE_CONTENT_TYPE_JSON;
case "smile":
return org.opensearch.protobufs.SourceContentType.SOURCE_CONTENT_TYPE_SMILE;
case "cbor":
return org.opensearch.protobufs.SourceContentType.SOURCE_CONTENT_TYPE_CBOR;
case "yaml":
return org.opensearch.protobufs.SourceContentType.SOURCE_CONTENT_TYPE_YAML;
default:
return org.opensearch.protobufs.SourceContentType.SOURCE_CONTENT_TYPE_UNSPECIFIED;
}
}

/**
* Helper method to process source information.
*
Expand All @@ -209,6 +237,13 @@ private static void processSource(SearchHit hit, org.opensearch.protobufs.HitsMe
} else {
hitBuilder.setXSource(ByteString.copyFrom(bytesRef.bytes, bytesRef.offset, bytesRef.length));
}

// Detect and set the source content type
org.opensearch.core.xcontent.MediaType mediaType = org.opensearch.core.xcontent.MediaTypeRegistry.xContentType(sourceRef);
if (mediaType != null) {
org.opensearch.protobufs.SourceContentType sourceContentType = mapMediaTypeToProtoEnum(mediaType);
hitBuilder.setXSourceContentType(sourceContentType);
}
}
}

Expand Down
Loading