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

fix mysqltest

Browse Source
This commit is contained in:
obdev
2022-12-27 00:38:07 +00:00
committed by ob-robot
parent 362f7075e4
commit 529e541dd6
17 changed files with 117 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
#include "storage/compaction/ob_tenant_compaction_progress.h"
#include "observer/omt/ob_tenant_config_mgr.h"
#include "share/scn.h"
#include "storage/compaction/ob_tenant_tablet_scheduler.h"
using namespace oceanbase;
using namespace common;
@ -859,6 +860,7 @@ int ObPartitionMergePolicy::refine_minor_merge_result(
// call this func means have serialized medium compaction clog = medium_snapshot
int ObPartitionMergePolicy::check_need_medium_merge(
ObLS &ls,
storage::ObTablet &tablet,
const int64_t medium_snapshot,
bool &need_merge,
@ -877,7 +879,8 @@ int ObPartitionMergePolicy::check_need_medium_merge(
need_merge = last_major->get_snapshot_version() < medium_snapshot;
if (need_merge
&& is_tablet_data_status_complete
&& tablet.get_tablet_meta().max_serialized_medium_scn_ >= medium_snapshot) {
&& tablet.get_tablet_meta().max_serialized_medium_scn_ >= medium_snapshot
&& ObTenantTabletScheduler::check_weak_read_ts_ready(medium_snapshot, ls)) {
can_merge = true;
}
}