SearchHit id nullable

Signed-off-by: Finn Carroll <[email protected]>
finnegancarroll · Sep 6, 2024 · 087fddd · 087fddd
1 parent 912ec45
commit 087fddd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/search/SearchHit.java b/server/src/main/java/org/opensearch/search/SearchHit.java
@@ -178,11 +178,14 @@ public void fromProtobufStream(StreamInput in) throws IOException {
     private SearchHitsTransportProto.SearchHitProto toProto() {
         SearchHitsTransportProto.SearchHitProto.Builder builder = SearchHitsTransportProto.SearchHitProto.newBuilder()
             .setScore(score)
-            .setId(id.string())
             .setVersion(version)
             .setSeqNo(seqNo)
             .setPrimaryTerm(primaryTerm);
 
+        if (id != null) {
+            builder.setId(id.string());
+        }
+
         if (nestedIdentity != null) {
             builder.setNestedIdentity(nestedIdentityToProto(nestedIdentity));
         }
@@ -224,10 +227,15 @@ private void fromProto(SearchHitsTransportProto.SearchHitProto proto) {
         seqNo = proto.getSeqNo();
         version = proto.getVersion();
         primaryTerm = proto.getPrimaryTerm();
-        id = new Text(proto.getId());
         sortValues = searchSortValuesFromProto(proto.getSortValues());
         matchedQueries = proto.getMatchedQueriesMap();
 
+        if (proto.hasId()) {
+            id = new Text(proto.getId());
+        } else {
+            id = null;
+        }
+
         if (proto.hasNestedIdentity()) {
             nestedIdentity = nestedIdentityFromProto(proto.getNestedIdentity());
         } else {

diff --git a/server/src/main/java/org/opensearch/transport/protobuf/SearchHitProtobuf.java b/server/src/main/java/org/opensearch/transport/protobuf/SearchHitProtobuf.java
@@ -73,6 +73,8 @@ public SearchHitProto toProto() {
             .setSeqNo(seqNo)
             .setPrimaryTerm(primaryTerm);
 
+
+
         if (nestedIdentity != null) {
             builder.setNestedIdentity(nestedIdentityToProto(nestedIdentity));
         }

diff --git a/server/src/main/proto/serde/SearchHitsProto.proto b/server/src/main/proto/serde/SearchHitsProto.proto
@@ -49,7 +49,7 @@ Map<String, SearchHits> innerHits
 */
 message SearchHitProto {
   float score = 1;
-  string id = 2;
+  optional string id = 2;
   int64 version = 3;
   int64 seq_no = 4;
   int64 primary_term = 5;