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

overwrite data store desc

Browse Source
This commit is contained in:
obdev
2022-12-14 10:07:45 +00:00
committed by ob-robot
parent 53d44e91b8
commit 28e65a11f6
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2119,12 +2119,20 @@ int ObMetaIndexBlockBuilder::close(
int ObMetaIndexBlockBuilder::build_single_macro_row_desc(const IndexMicroBlockDescList &roots) int ObMetaIndexBlockBuilder::build_single_macro_row_desc(const IndexMicroBlockDescList &roots)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObDataStoreDesc data_desc;
if (OB_UNLIKELY(1 != roots.count() || 1 != roots[0]->macro_metas_->count())) { if (OB_UNLIKELY(1 != roots.count() || 1 != roots[0]->macro_metas_->count())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "number of macro meta should be 1", K(ret), K(roots)); STORAGE_LOG(WARN, "number of macro meta should be 1", K(ret), K(roots));
} else if (OB_FAIL(data_desc.assign(*index_store_desc_))) {
STORAGE_LOG(WARN, "fail to assign data desc", K(ret), KPC(index_store_desc_));
} else { } else {
ObIndexBlockRowDesc row_desc(*index_store_desc_);
const ObDataBlockMetaVal &macro_meta_val = roots[0]->macro_metas_->at(0)->val_; const ObDataBlockMetaVal &macro_meta_val = roots[0]->macro_metas_->at(0)->val_;
data_desc.row_store_type_ = macro_meta_val.row_store_type_;
data_desc.compressor_type_ = macro_meta_val.compressor_type_;
data_desc.master_key_id_ = macro_meta_val.master_key_id_;
data_desc.encrypt_id_ = macro_meta_val.encrypt_id_;
MEMCPY(data_desc.encrypt_key_, macro_meta_val.encrypt_key_, share::OB_MAX_TABLESPACE_ENCRYPT_KEY_LENGTH);
ObIndexBlockRowDesc row_desc(data_desc);
row_desc.row_key_ = roots[0]->macro_metas_->at(0)->end_key_; row_desc.row_key_ = roots[0]->macro_metas_->at(0)->end_key_;
row_desc.macro_id_ = macro_meta_val.macro_id_; row_desc.macro_id_ = macro_meta_val.macro_id_;
row_desc.block_offset_ = roots[0]->meta_block_offset_; row_desc.block_offset_ = roots[0]->meta_block_offset_;

1
src/storage/blocksstable/ob_shared_macro_block_manager.cpp
View File

@ -671,6 +671,7 @@ int ObSharedMacroBlockMgr::prepare_data_desc(
data_desc.compressor_type_ = basic_meta.compressor_type_; data_desc.compressor_type_ = basic_meta.compressor_type_;
data_desc.master_key_id_ = basic_meta.master_key_id_; data_desc.master_key_id_ = basic_meta.master_key_id_;
data_desc.encrypt_id_ = basic_meta.encrypt_id_; data_desc.encrypt_id_ = basic_meta.encrypt_id_;
data_desc.encoder_opt_.set_store_type(basic_meta.row_store_type_);
MEMCPY(data_desc.encrypt_key_, basic_meta.encrypt_key_, share::OB_MAX_TABLESPACE_ENCRYPT_KEY_LENGTH); MEMCPY(data_desc.encrypt_key_, basic_meta.encrypt_key_, share::OB_MAX_TABLESPACE_ENCRYPT_KEY_LENGTH);
data_desc.row_column_count_ = data_desc.rowkey_column_count_ + 1; data_desc.row_column_count_ = data_desc.rowkey_column_count_ + 1;
data_desc.col_desc_array_.reset(); data_desc.col_desc_array_.reset();