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

fix white-scan problems && unit test

Browse Source
This commit is contained in:
obdev
2022-12-29 11:11:46 +00:00
committed by ob-robot
parent 13aa8ace6b
commit b39b8c45f0
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,11 @@ int ObPartitionMergePolicy::get_medium_merge_tables(
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(ret)) {
} else if (OB_ISNULL(base_table)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null base table", K(ret), K(tablet));
} else {
result.version_range_.base_version_ = base_table->get_upper_trans_version();
result.version_range_.multi_version_start_ = tablet.get_multi_version_start();
result.version_range_.snapshot_version_ = param.merge_version_;
@ -1210,9 +1214,6 @@ int ObAdaptiveMergePolicy::find_meta_major_tables(
LOG_WARN("Failed to find meta merge base table", K(ret), KPC(last_major), KPC(last_major), KPC(base_table));
}
} else if (FALSE_IT(base_table = nullptr == base_table ? last_major : base_table)) {
} else if (OB_ISNULL(base_table)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("base table is unexpected null", K(ret), KP(base_table));
} else if (base_table->get_snapshot_version() < min_snapshot || max_snapshot != INT64_MAX) {
// max_snapshot == INT64_MAX means there's no next freeze_info
ret = OB_NO_NEED_MERGE;