This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 35064dc63ba [fix](merge-cloud) Avoid converting unset fields of
RowsetMeta (#30559)
35064dc63ba is described below
commit 35064dc63ba478003fa1127c548014b6cd589d3e
Author: walter <w41te...@gmail.com>
AuthorDate: Tue Jan 30 23:33:19 2024 +0800
[fix](merge-cloud) Avoid converting unset fields of RowsetMeta (#30559)
---
be/src/cloud/pb_convert.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/be/src/cloud/pb_convert.cpp b/be/src/cloud/pb_convert.cpp
index 664a9f53c50..f52ce9c2218 100644
--- 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());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
