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

rm macro_id_set_ from idx_rebuilder

Browse Source
This commit is contained in:
obdev
2023-06-06 08:12:13 +00:00
committed by ob-robot
parent b9dc170c63
commit e1fbaf05c8
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/storage/blocksstable/ob_index_block_builder.cpp
View File

@ -2334,7 +2334,6 @@ ObIndexBlockRebuilder::ObIndexBlockRebuilder()
mutex_(common::ObLatchIds::INDEX_BUILDER_LOCK), mutex_(common::ObLatchIds::INDEX_BUILDER_LOCK),
index_store_desc_(nullptr), index_store_desc_(nullptr),
block_write_ctx_(), block_write_ctx_(),
macro_id_set_(),
root_micro_block_desc_(nullptr), root_micro_block_desc_(nullptr),
macro_meta_list_(nullptr), macro_meta_list_(nullptr),
sstable_allocator_(nullptr), sstable_allocator_(nullptr),
@ -2352,7 +2351,6 @@ void ObIndexBlockRebuilder::reset()
{ {
index_store_desc_ = nullptr; index_store_desc_ = nullptr;
block_write_ctx_.reset(); block_write_ctx_.reset();
macro_id_set_.destroy();
root_micro_block_desc_ = nullptr; root_micro_block_desc_ = nullptr;
macro_meta_list_ = nullptr; macro_meta_list_ = nullptr;
sstable_allocator_ = nullptr; sstable_allocator_ = nullptr;
@ -2368,9 +2366,6 @@ int ObIndexBlockRebuilder::init(ObSSTableIndexBuilder &sstable_builder)
if (OB_UNLIKELY(is_inited_)) { if (OB_UNLIKELY(is_inited_)) {
ret = OB_INIT_TWICE; ret = OB_INIT_TWICE;
STORAGE_LOG(WARN, "ObIndexBlockRebuilder has been inited", K(ret)); STORAGE_LOG(WARN, "ObIndexBlockRebuilder has been inited", K(ret));
} else if (OB_FAIL(macro_id_set_.create(
bucket_num, ObModIds::OB_HASH_BUCKET, ObModIds::OB_HASH_BUCKET, MTL_ID()))) {
STORAGE_LOG(WARN, "fail to create macro id set", K(ret));
} else if (OB_FAIL(sstable_builder.init_builder_ptrs(sstable_builder_, index_store_desc_, } else if (OB_FAIL(sstable_builder.init_builder_ptrs(sstable_builder_, index_store_desc_,
sstable_allocator_, root_micro_block_desc_, macro_meta_list_))) { sstable_allocator_, root_micro_block_desc_, macro_meta_list_))) {
STORAGE_LOG(WARN, "fail to init referemce pointer members", K(ret)); STORAGE_LOG(WARN, "fail to init referemce pointer members", K(ret));
@ -2579,14 +2574,7 @@ int ObIndexBlockRebuilder::append_macro_row(const ObDataMacroBlockMeta &macro_me
STORAGE_LOG(WARN, "invalid macro meta", K(ret), K(macro_meta)); STORAGE_LOG(WARN, "invalid macro meta", K(ret), K(macro_meta));
} else { } else {
lib::ObMutexGuard guard(mutex_); // migration will append concurrently lib::ObMutexGuard guard(mutex_); // migration will append concurrently
if (OB_FAIL(macro_id_set_.set_refactored(macro_meta.val_.macro_id_, 0 /*no override*/))) { if (OB_FAIL(ObDataIndexBlockBuilder::add_macro_block_meta(
if (OB_HASH_EXIST != ret) {
STORAGE_LOG(WARN, "fail to put macro id into set", K(ret), K(macro_meta));
} else {
STORAGE_LOG(INFO, "duplicated macro meta", K(macro_meta));
ret = OB_SUCCESS;
}
} else if (OB_FAIL(ObDataIndexBlockBuilder::add_macro_block_meta(
macro_meta, *macro_meta_list_, *sstable_allocator_))) { macro_meta, *macro_meta_list_, *sstable_allocator_))) {
STORAGE_LOG(WARN, "failed to add macro block meta", K(ret), K(macro_meta)); STORAGE_LOG(WARN, "failed to add macro block meta", K(ret), K(macro_meta));
} else if (OB_FAIL(block_write_ctx_.add_macro_block_id(macro_meta.val_.macro_id_))) { // inc_ref } else if (OB_FAIL(block_write_ctx_.add_macro_block_id(macro_meta.val_.macro_id_))) { // inc_ref

1
src/storage/blocksstable/ob_index_block_builder.h
View File

@ -413,7 +413,6 @@ private:
lib::ObMutex mutex_; lib::ObMutex mutex_;
ObDataStoreDesc *index_store_desc_; ObDataStoreDesc *index_store_desc_;
ObMacroBlocksWriteCtx block_write_ctx_; ObMacroBlocksWriteCtx block_write_ctx_;
common::hash::ObHashSet<MacroBlockId> macro_id_set_;
ObIndexMicroBlockDesc *root_micro_block_desc_; ObIndexMicroBlockDesc *root_micro_block_desc_;
ObMacroMetasArray *macro_meta_list_; ObMacroMetasArray *macro_meta_list_;
ObIAllocator *sstable_allocator_; ObIAllocator *sstable_allocator_;