hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Repair compatibility issues in transfer struct, add 'task_id_' as placeholder in the related struct .

Browse Source
This commit is contained in:
obdev
2024-02-26 13:48:26 +00:00
committed by ob-robot
parent 0323ccb138
commit f68293524b
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/high_availability/ob_transfer_struct.h
View File

@ -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<share::ObTransferTabletInfo> 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<ObMigrationTabletParam> 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<share::ObTransferTabletInfo> 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<share::ObTransferTabletInfo> tablet_list_;
share::ObTransferTaskID task_id_;
DISALLOW_COPY_AND_ASSIGN(ObTXFinishTransferInInfo);
};