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

[bugfix] Fix latest_row_store_type for migrate after upgrade from version 4.0 to version 4.1

Browse Source
This commit is contained in:
saltonz
2023-02-14 14:42:35 +00:00
committed by ob-robot
parent 0664c26d30
commit 38f55496aa
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/tablet/ob_tablet_create_delete_helper.cpp
View File

@ -2338,8 +2338,9 @@ int ObTabletCreateDeleteHelper::build_create_sstable_param(
+ ObMultiVersionRowkeyHelpper::get_extra_rowkey_col_cnt(); + ObMultiVersionRowkeyHelpper::get_extra_rowkey_col_cnt();
param.root_block_addr_.set_none_addr(); param.root_block_addr_.set_none_addr();
param.data_block_macro_meta_addr_.set_none_addr(); param.data_block_macro_meta_addr_.set_none_addr();
param.root_row_store_type_ = ObRowStoreType::FLAT_ROW_STORE; param.root_row_store_type_ = (ObRowStoreType::ENCODING_ROW_STORE == table_schema.get_row_store_type()
param.latest_row_store_type_ = ObRowStoreType::FLAT_ROW_STORE; ? ObRowStoreType::SELECTIVE_ENCODING_ROW_STORE : table_schema.get_row_store_type());
param.latest_row_store_type_ = table_schema.get_row_store_type();
param.data_index_tree_height_ = 0; param.data_index_tree_height_ = 0;
param.index_blocks_cnt_ = 0; param.index_blocks_cnt_ = 0;
param.data_blocks_cnt_ = 0; param.data_blocks_cnt_ = 0;

3
src/storage/tablet/ob_tablet_create_sstable_param.cpp
View File

@ -85,7 +85,8 @@ bool ObTabletCreateSSTableParam::is_valid() const
&& create_snapshot_version_ >= 0 && create_snapshot_version_ >= 0
&& index_type_ < share::schema::ObIndexType::INDEX_TYPE_MAX && index_type_ < share::schema::ObIndexType::INDEX_TYPE_MAX
&& root_row_store_type_ < ObRowStoreType::MAX_ROW_STORE && root_row_store_type_ < ObRowStoreType::MAX_ROW_STORE
&& latest_row_store_type_ < ObRowStoreType::MAX_ROW_STORE && (latest_row_store_type_ < ObRowStoreType::MAX_ROW_STORE
|| ObRowStoreType::DUMMY_ROW_STORE == latest_row_store_type_)
&& data_index_tree_height_ >= 0 && data_index_tree_height_ >= 0
&& index_blocks_cnt_ >= 0 && index_blocks_cnt_ >= 0
&& data_blocks_cnt_ >= 0 && data_blocks_cnt_ >= 0