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

fix estimate macro meta block size

Browse Source
This commit is contained in:
obdev
2022-10-28 06:05:09 +00:00
committed by wangzelin.wzl
parent ee2444860e
commit 766c19f8c3
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1460,13 +1460,6 @@ int ObDataIndexBlockBuilder::cal_macro_meta_block_size(
macro_meta.val_.logic_id_.logic_version_ = data_store_desc_->get_logical_version();
macro_meta.val_.logic_id_.tablet_id_ = data_store_desc_->tablet_id_.id();
macro_meta.val_.macro_id_ = ObIndexBlockRowHeader::DEFAULT_IDX_ROW_MACRO_ID;
if (data_store_desc_->is_major_merge()) {
for (int64_t j = 0; OB_SUCC(ret) && j < column_cnt; ++j) {
if (OB_FAIL(macro_meta.val_.column_checksums_.push_back(0))) {
STORAGE_LOG(WARN, "fail to push back column checksum", K(ret), K(j), K(column_cnt));
}
}
}
meta_row_.reuse();
row_allocator_.reuse();
if (OB_FAIL(ret)) {
@ -1486,10 +1479,8 @@ int ObDataIndexBlockBuilder::cal_macro_meta_block_size(
STORAGE_LOG(WARN, "unexpected meta block desc", K(ret), K(meta_block_desc));
} else {
estimate_meta_block_size = meta_block_desc.buf_size_ + meta_block_desc.header_->header_size_;
estimate_meta_block_size =
data_store_desc_->encrypt_id_ > static_cast<int64_t>(share::ObAesOpMode::ob_invalid_mode)
? share::ObEncryptionUtil::encrypted_length(estimate_meta_block_size)
: estimate_meta_block_size;
const int64_t encrypted_size = share::ObEncryptionUtil::encrypted_length(estimate_meta_block_size);
estimate_meta_block_size = max(estimate_meta_block_size, encrypted_size);
}
}
}

3
src/storage/blocksstable/ob_macro_block_meta.cpp
View File

@ -294,9 +294,8 @@ int64_t ObDataBlockMetaVal::get_max_serialize_size() const
{
int64_t len = sizeof(*this);
len -= sizeof(column_checksums_);
const int64_t column_count = column_checksums_.count();
len += sizeof(int64_t); // serialize column count
len += sizeof(int64_t) * column_count; // serialize each checksum
len += sizeof(int64_t) * column_count_; // serialize each checksum
return len;
}
DEFINE_GET_SERIALIZE_SIZE(ObDataBlockMetaVal)