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

fix miss ret problem

Browse Source
This commit is contained in:
chaser-ch
2024-04-07 08:12:12 +00:00
committed by ob-robot
parent 0c578dab2e
commit 5a4de37bb6
15 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/compaction/ob_partition_merge_policy.cpp
View File

@ -573,7 +573,7 @@ int ObPartitionMergePolicy::find_minor_merge_tables(
"last_end_log_ts", result.scn_range_.end_scn_, K(tmp_table_handle));
result.reset_handle_and_range();
}
if (OB_FAIL(result.handle_.add_table(tmp_table_handle))) {
if (FAILEDx(result.handle_.add_table(tmp_table_handle))) {
LOG_WARN("Failed to add table", K(ret), KPC(table));
} else {
if (1 == result.handle_.get_count()) {

2
src/storage/compaction/ob_partition_merger.cpp
View File

@ -892,6 +892,7 @@ int ObPartitionMajorMerger::reuse_base_sstable(ObPartitionMergeHelper &merge_hel
// flush all row in curr macro block
while (OB_SUCC(ret) && base_iter->is_macro_block_opened()) {
if (OB_ISNULL(base_iter->get_curr_row())) {
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "curr row is unexpected null", K(ret), KPC(base_iter));
} else if (OB_FAIL(process(*base_iter->get_curr_row()))) {
STORAGE_LOG(WARN, "Failed to process row", K(ret), K(partition_fuser_->get_result_row()));
@ -1649,6 +1650,7 @@ void ObPartitionMergeDumper::print_error_info(const int err_no,
ObITable *table = tables_handle.get_table(idx);
ObITable *dump_table = nullptr;
if (OB_ISNULL(table)) {
ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "The store is NULL", K(idx), K(tables_handle));
} else if (OB_FAIL(compaction::ObPartitionMergeDumper::judge_disk_free_space(dump_table_dir,
table))) {

2
src/storage/compaction/ob_tenant_tablet_scheduler.cpp
View File

@ -1760,7 +1760,7 @@ int ObTenantTabletScheduler::update_major_progress(const int64_t merge_version)
LOG_WARN("failed to finish progress", KR(ret), K(merge_version));
}
}
if (OB_FAIL(MTL(ObTenantCompactionProgressMgr *)->update_progress_status(
if (FAILEDx(MTL(ObTenantCompactionProgressMgr *)->update_progress_status(
merge_version, share::ObIDag::DAG_STATUS_NODE_RUNNING))) {
LOG_WARN("failed to update progress", KR(ret), K(merge_version));
}