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

fix backup report -4002

Browse Source
This commit is contained in:
oceanoverflow
2023-02-09 18:08:39 +00:00
committed by ob-robot
parent 1cc67400fc
commit 3653285a16
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/backup/ob_backup_utils.cpp
View File

@ -658,9 +658,8 @@ int ObBackupTabletStat::mark_item_reused(const share::ObBackupDataType &backup_d
ObMutexGuard guard(mutex_); ObMutexGuard guard(mutex_);
ObBackupProviderItem item; ObBackupProviderItem item;
ObBackupProviderItemType item_type = PROVIDER_ITEM_MACRO_ID; ObBackupProviderItemType item_type = PROVIDER_ITEM_MACRO_ID;
blocksstable::MacroBlockId fake_macro_id;
ObBackupMacroBlockId macro_id; ObBackupMacroBlockId macro_id;
macro_id.macro_block_id_ = fake_macro_id; macro_id.macro_block_id_ = ObBackupProviderItem::get_fake_macro_id_();
macro_id.logic_id_ = id_pair.logic_id_; macro_id.logic_id_ = id_pair.logic_id_;
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
@ -1324,7 +1323,7 @@ DEFINE_GET_SERIALIZE_SIZE(ObBackupProviderItem)
return size; return size;
} }
ObITable::TableKey ObBackupProviderItem::get_fake_table_key_() const ObITable::TableKey ObBackupProviderItem::get_fake_table_key_()
{ {
ObITable::TableKey table_key; ObITable::TableKey table_key;
table_key.tablet_id_ = ObTabletID(1); table_key.tablet_id_ = ObTabletID(1);
@ -1334,12 +1333,12 @@ ObITable::TableKey ObBackupProviderItem::get_fake_table_key_() const
return table_key; return table_key;
} }
ObLogicMacroBlockId ObBackupProviderItem::get_fake_logic_id_() const ObLogicMacroBlockId ObBackupProviderItem::get_fake_logic_id_()
{ {
return ObLogicMacroBlockId(0/*data_seq*/, 1/*logic_version*/, 1/*tablet_id*/); return ObLogicMacroBlockId(0/*data_seq*/, 1/*logic_version*/, 1/*tablet_id*/);
} }
MacroBlockId ObBackupProviderItem::get_fake_macro_id_() const MacroBlockId ObBackupProviderItem::get_fake_macro_id_()
{ {
return MacroBlockId(4096/*first_id*/, 0/*second_id*/, 0/*third_id*/); return MacroBlockId(4096/*first_id*/, 0/*second_id*/, 0/*third_id*/);
} }

7
src/storage/backup/ob_backup_utils.h
View File

@ -176,6 +176,7 @@ enum ObBackupProviderItemType {
}; };
class ObBackupProviderItem { class ObBackupProviderItem {
friend class ObBackupTabletStat;
public: public:
ObBackupProviderItem(); ObBackupProviderItem();
virtual ~ObBackupProviderItem(); virtual ~ObBackupProviderItem();
@ -201,9 +202,9 @@ public:
NEED_SERIALIZE_AND_DESERIALIZE; NEED_SERIALIZE_AND_DESERIALIZE;
private: private:
// for parallel external sort serialization restriction // for parallel external sort serialization restriction
ObITable::TableKey get_fake_table_key_() const; static ObITable::TableKey get_fake_table_key_();
blocksstable::ObLogicMacroBlockId get_fake_logic_id_() const; static blocksstable::ObLogicMacroBlockId get_fake_logic_id_();
blocksstable::MacroBlockId get_fake_macro_id_() const; static blocksstable::MacroBlockId get_fake_macro_id_();
private: private:
ObBackupProviderItemType item_type_; ObBackupProviderItemType item_type_;