diff --git a/src/storage/high_availability/ob_transfer_struct.cpp b/src/storage/high_availability/ob_transfer_struct.cpp index 6fa1d85662..cd847852ec 100644 --- a/src/storage/high_availability/ob_transfer_struct.cpp +++ b/src/storage/high_availability/ob_transfer_struct.cpp @@ -30,6 +30,7 @@ ObTXStartTransferOutInfo::ObTXStartTransferOutInfo() : src_ls_id_(), dest_ls_id_(), tablet_list_(), + task_id_(), data_end_scn_() { } @@ -39,6 +40,7 @@ void ObTXStartTransferOutInfo::reset() src_ls_id_.reset(); dest_ls_id_.reset(); tablet_list_.reset(); + task_id_.reset(); data_end_scn_.reset(); transfer_epoch_ = 0; } @@ -62,19 +64,21 @@ int ObTXStartTransferOutInfo::assign(const ObTXStartTransferOutInfo &start_trans } else { src_ls_id_ = start_transfer_out_info.src_ls_id_; dest_ls_id_ = start_transfer_out_info.dest_ls_id_; + task_id_ = start_transfer_out_info.task_id_; data_end_scn_ = start_transfer_out_info.data_end_scn_; transfer_epoch_ = start_transfer_out_info.transfer_epoch_; } return ret; } -OB_SERIALIZE_MEMBER(ObTXStartTransferOutInfo, src_ls_id_, dest_ls_id_, tablet_list_, data_end_scn_, transfer_epoch_); +OB_SERIALIZE_MEMBER(ObTXStartTransferOutInfo, src_ls_id_, dest_ls_id_, tablet_list_, task_id_, data_end_scn_, transfer_epoch_); ObTXStartTransferInInfo::ObTXStartTransferInInfo() : src_ls_id_(), dest_ls_id_(), start_scn_(), - tablet_meta_list_() + tablet_meta_list_(), + task_id_() { } @@ -84,6 +88,7 @@ void ObTXStartTransferInInfo::reset() dest_ls_id_.reset(); start_scn_.reset(); tablet_meta_list_.reset(); + task_id_.reset(); } bool ObTXStartTransferInInfo::is_valid() const @@ -106,20 +111,22 @@ int ObTXStartTransferInInfo::assign(const ObTXStartTransferInInfo &start_transfe src_ls_id_ = start_transfer_in_info.src_ls_id_; dest_ls_id_ = start_transfer_in_info.dest_ls_id_; start_scn_ = start_transfer_in_info.start_scn_; + task_id_ = start_transfer_in_info.task_id_; } return ret; } -OB_SERIALIZE_MEMBER(ObTXStartTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_meta_list_); +OB_SERIALIZE_MEMBER(ObTXStartTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_meta_list_, task_id_); /* ObTXFinishTransferInInfo */ -OB_SERIALIZE_MEMBER(ObTXFinishTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_list_); +OB_SERIALIZE_MEMBER(ObTXFinishTransferInInfo, src_ls_id_, dest_ls_id_, start_scn_, tablet_list_, task_id_); ObTXFinishTransferInInfo::ObTXFinishTransferInInfo() : src_ls_id_(), dest_ls_id_(), start_scn_(), - tablet_list_() + tablet_list_(), + task_id_() { } @@ -129,6 +136,7 @@ void ObTXFinishTransferInInfo::reset() dest_ls_id_.reset(); start_scn_.reset(); tablet_list_.reset(); + task_id_.reset(); } bool ObTXFinishTransferInInfo::is_valid() const @@ -151,17 +159,19 @@ int ObTXFinishTransferInInfo::assign(const ObTXFinishTransferInInfo &finish_tran src_ls_id_ = finish_transfer_in_info.src_ls_id_; dest_ls_id_ = finish_transfer_in_info.dest_ls_id_; start_scn_ = finish_transfer_in_info.start_scn_; + task_id_ = finish_transfer_in_info.task_id_; } return ret; } /* ObTXFinishTransferOutInfo */ -OB_SERIALIZE_MEMBER(ObTXFinishTransferOutInfo, src_ls_id_, dest_ls_id_, finish_scn_, tablet_list_); +OB_SERIALIZE_MEMBER(ObTXFinishTransferOutInfo, src_ls_id_, dest_ls_id_, finish_scn_, tablet_list_, task_id_); ObTXFinishTransferOutInfo::ObTXFinishTransferOutInfo() : src_ls_id_(), dest_ls_id_(), finish_scn_(), - tablet_list_() + tablet_list_(), + task_id_() { } void ObTXFinishTransferOutInfo::reset() @@ -170,6 +180,7 @@ void ObTXFinishTransferOutInfo::reset() dest_ls_id_.reset(); finish_scn_.reset(); tablet_list_.reset(); + task_id_.reset(); } bool ObTXFinishTransferOutInfo::is_valid() const { @@ -191,6 +202,7 @@ int ObTXFinishTransferOutInfo::assign(const ObTXFinishTransferOutInfo &finish_tr src_ls_id_ = finish_transfer_out_info.src_ls_id_; dest_ls_id_ = finish_transfer_out_info.dest_ls_id_; finish_scn_ = finish_transfer_out_info.finish_scn_; + task_id_ = finish_transfer_out_info.task_id_; } return ret; } diff --git a/src/storage/high_availability/ob_transfer_struct.h b/src/storage/high_availability/ob_transfer_struct.h index ed4e64f867..7d9f52b665 100644 --- a/src/storage/high_availability/ob_transfer_struct.h +++ b/src/storage/high_availability/ob_transfer_struct.h @@ -37,11 +37,12 @@ public: bool is_valid() const; int assign(const ObTXStartTransferOutInfo &start_transfer_out_info); - TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(tablet_list), K_(data_end_scn), K_(transfer_epoch)); + TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(tablet_list), K_(task_id), K_(data_end_scn), K_(transfer_epoch)); share::ObLSID src_ls_id_; share::ObLSID dest_ls_id_; common::ObSArray tablet_list_; + share::ObTransferTaskID task_id_; share::SCN data_end_scn_; int64_t transfer_epoch_; DISALLOW_COPY_AND_ASSIGN(ObTXStartTransferOutInfo); @@ -57,12 +58,14 @@ public: bool is_valid() const; int assign(const ObTXStartTransferInInfo &start_transfer_in_info); - TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_meta_list)); + TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_meta_list), K_(task_id)); share::ObLSID src_ls_id_; share::ObLSID dest_ls_id_; share::SCN start_scn_; common::ObSArray tablet_meta_list_; + share::ObTransferTaskID task_id_; + DISALLOW_COPY_AND_ASSIGN(ObTXStartTransferInInfo); }; @@ -76,11 +79,12 @@ public: bool is_valid() const; int assign(const ObTXFinishTransferOutInfo &finish_transfer_out_info); - TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(finish_scn), K_(tablet_list)); + TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(finish_scn), K_(tablet_list), K_(task_id)); share::ObLSID src_ls_id_; share::ObLSID dest_ls_id_; share::SCN finish_scn_; common::ObSArray tablet_list_; + share::ObTransferTaskID task_id_; DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferOutInfo); }; @@ -94,11 +98,12 @@ public: bool is_valid() const; int assign(const ObTXFinishTransferInInfo &finish_transfer_in_info); - TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_list)); + TO_STRING_KV(K_(src_ls_id), K_(dest_ls_id), K_(start_scn), K_(tablet_list), K_(task_id)); share::ObLSID src_ls_id_; share::ObLSID dest_ls_id_; share::SCN start_scn_; common::ObSArray tablet_list_; + share::ObTransferTaskID task_id_; DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferInInfo); };