[fix](merge-cloud) Avoid converting unset fields of RowsetMeta

apache · Jan 30, 2024 · 9e1c359 · 9e1c359
1 parent 453c345
commit 9e1c359
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/be/src/cloud/pb_convert.cpp b/be/src/cloud/pb_convert.cpp
@@ -59,7 +59,9 @@ void doris_rowset_meta_to_cloud(RowsetMetaCloudPB* out, const RowsetMetaPB& in)
     out->mutable_load_id()->CopyFrom(in.load_id());
     out->set_delete_flag(in.delete_flag());
     out->set_creation_time(in.creation_time());
-    out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    if (in.has_tablet_uid()) {
+        out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    }
     out->set_num_segments(in.num_segments());
     out->set_rowset_id_v2(in.rowset_id_v2());
     out->set_resource_id(in.resource_id());
@@ -103,7 +105,9 @@ void doris_rowset_meta_to_cloud(RowsetMetaCloudPB* out, RowsetMetaPB&& in) {
     out->mutable_load_id()->CopyFrom(in.load_id());
     out->set_delete_flag(in.delete_flag());
     out->set_creation_time(in.creation_time());
-    out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    if (in.has_tablet_uid()) {
+        out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    }
     out->set_num_segments(in.num_segments());
     out->set_rowset_id_v2(in.rowset_id_v2());
     out->set_resource_id(in.resource_id());
@@ -160,7 +164,9 @@ void cloud_rowset_meta_to_doris(RowsetMetaPB* out, const RowsetMetaCloudPB& in)
     out->mutable_load_id()->CopyFrom(in.load_id());
     out->set_delete_flag(in.delete_flag());
     out->set_creation_time(in.creation_time());
-    out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    if (in.has_tablet_uid()) {
+        out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    }
     out->set_num_segments(in.num_segments());
     out->set_rowset_id_v2(in.rowset_id_v2());
     out->set_resource_id(in.resource_id());
@@ -204,7 +210,9 @@ void cloud_rowset_meta_to_doris(RowsetMetaPB* out, RowsetMetaCloudPB&& in) {
     out->mutable_load_id()->CopyFrom(in.load_id());
     out->set_delete_flag(in.delete_flag());
     out->set_creation_time(in.creation_time());
-    out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    if (in.has_tablet_uid()) {
+        out->mutable_tablet_uid()->CopyFrom(in.tablet_uid());
+    }
     out->set_num_segments(in.num_segments());
     out->set_rowset_id_v2(in.rowset_id_v2());
     out->set_resource_id(in.resource_id());