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

fix defragmentation can't be finished

Browse Source
This commit is contained in:
obdev
2022-12-05 14:12:57 +00:00
committed by ob-robot
parent 94408dcb3d
commit 2e80347b0a
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,6 +583,7 @@ int ObSharedMacroBlockMgr::create_new_sstable(
param.filled_tx_scn_ = basic_meta.filled_tx_scn_; param.filled_tx_scn_ = basic_meta.filled_tx_scn_;
param.ddl_scn_ = basic_meta.ddl_scn_; param.ddl_scn_ = basic_meta.ddl_scn_;
param.table_key_ = old_table.get_key(); param.table_key_ = old_table.get_key();
param.sstable_logic_seq_ = old_table.get_sstable_seq();
param.table_mode_ = basic_meta.table_mode_; param.table_mode_ = basic_meta.table_mode_;
param.index_type_ = static_cast<share::schema::ObIndexType>(basic_meta.index_type_); param.index_type_ = static_cast<share::schema::ObIndexType>(basic_meta.index_type_);
param.schema_version_ = basic_meta.schema_version_; param.schema_version_ = basic_meta.schema_version_;

2
src/storage/high_availability/ob_physical_copy_task.cpp
View File

@ -933,6 +933,7 @@ int ObPhysicalCopyFinishTask::build_create_sstable_param_(
} else { } else {
const ObStorageSchema &storage_schema = tablet->get_storage_schema(); const ObStorageSchema &storage_schema = tablet->get_storage_schema();
param.table_key_ = sstable_param_->table_key_; param.table_key_ = sstable_param_->table_key_;
param.sstable_logic_seq_ = sstable_param_->basic_meta_.sstable_logic_seq_;
param.schema_version_ = sstable_param_->basic_meta_.schema_version_; param.schema_version_ = sstable_param_->basic_meta_.schema_version_;
param.table_mode_ = sstable_param_->basic_meta_.table_mode_; param.table_mode_ = sstable_param_->basic_meta_.table_mode_;
param.index_type_ = static_cast<share::schema::ObIndexType>(sstable_param_->basic_meta_.index_type_); param.index_type_ = static_cast<share::schema::ObIndexType>(sstable_param_->basic_meta_.index_type_);
@ -992,6 +993,7 @@ int ObPhysicalCopyFinishTask::build_create_sstable_param_(
LOG_WARN("sstable param has data macro block, can not build sstable from basic meta", K(ret), KPC(sstable_param_)); LOG_WARN("sstable param has data macro block, can not build sstable from basic meta", K(ret), KPC(sstable_param_));
} else { } else {
param.table_key_ = sstable_param_->table_key_; param.table_key_ = sstable_param_->table_key_;
param.sstable_logic_seq_ = sstable_param_->basic_meta_.sstable_logic_seq_;
param.schema_version_ = sstable_param_->basic_meta_.schema_version_; param.schema_version_ = sstable_param_->basic_meta_.schema_version_;
param.create_snapshot_version_ = sstable_param_->basic_meta_.create_snapshot_version_; param.create_snapshot_version_ = sstable_param_->basic_meta_.create_snapshot_version_;
param.table_mode_ = sstable_param_->basic_meta_.table_mode_; param.table_mode_ = sstable_param_->basic_meta_.table_mode_;