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

fix coredump in ObMicroBlockDecoder::release

Browse Source
This commit is contained in:
nroskill 2022-11-18 03:40:42 +00:00 committed by wangzelin.wzl
parent ece4bd9386
commit c8bf4203dc
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/storage/blocksstable/ob_micro_block_cache.cpp
View File

@ -167,7 +167,11 @@ int ObMicroBlockCacheValue::deep_copy(char *buf, const int64_t buf_len, ObIKVCac
const ObIndexBlockDataHeader *src_idx_header
= reinterpret_cast<const ObIndexBlockDataHeader *>(block_data_.get_extra_buf());
ObIndexBlockDataTransformer *transformer = nullptr;
if (OB_ISNULL(transformer = GET_TSI_MULT(ObIndexBlockDataTransformer, 1))) {
ObDecoderAllocator *allocator = nullptr;
if (OB_ISNULL(allocator = get_decoder_allocator())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate decoder allocator", K(ret));
} else if (OB_ISNULL(transformer = GET_TSI_MULT(ObIndexBlockDataTransformer, 1))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("Fail to get thread local index block data transformer", K(ret));
} else if (OB_FAIL(transformer->update_index_block(
@ -1423,10 +1427,14 @@ int ObIndexMicroBlockCache::ObIndexMicroBlockIOCallback::write_extra_buf_on_dema
{
int ret = OB_SUCCESS;
ObIndexBlockDataTransformer *transformer = nullptr;
ObDecoderAllocator *allocator = nullptr;
if (OB_ISNULL(index_read_info_)
|| OB_UNLIKELY(!index_read_info_->is_valid() || !micro_data.is_valid())) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("Invalid argument", K(ret), KPC(index_read_info_), K(micro_data));
} else if (OB_ISNULL(allocator = get_decoder_allocator())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate decoder allocator", K(ret));
} else if (OB_ISNULL(transformer = GET_TSI_MULT(ObIndexBlockDataTransformer, 1))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("Fail to allocate ObIndexBlockDataTransformer", K(ret));

4
src/storage/blocksstable/ob_sstable_meta_info.cpp
View File

@ -212,9 +212,13 @@ int ObRootBlockInfo::transform_root_block_data(const ObTableReadInfo &read_info)
int ret = OB_SUCCESS;
if (OB_ISNULL(block_data_.get_extra_buf()) && OB_NOT_NULL(block_data_.get_buf())) {
ObIndexBlockDataTransformer *transformer = nullptr;
ObDecoderAllocator *allocator = nullptr;
if (OB_UNLIKELY(!read_info.is_valid())) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid read_info", K(ret));
} else if (OB_ISNULL(allocator = get_decoder_allocator())) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate decoder allocator", K(ret));
} else if (OB_ISNULL(transformer = GET_TSI_MULT(ObIndexBlockDataTransformer, 1))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("fail to allocate transformer", K(ret));