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

fix add minor table to table store

Browse Source
This commit is contained in:
obdev 2022-11-04 04:35:58 +00:00 committed by wangzelin.wzl
parent cbeae2bffc
commit c259349b07
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,7 +490,7 @@ int ObTenantFreezeInfoMgr::diagnose_min_reserved_snapshot(
ret = OB_SUCCESS;
}
}
snapshot_version = std::max(0L, snapshot_gc_ts_ - duration * 1000L * 1000L);
snapshot_version = std::max(0L, snapshot_gc_ts_ - duration * 1000L * 1000L * 1000L);
snapshot_from_type = "undo_retention";
if (freeze_info.freeze_ts < snapshot_version) {
snapshot_version = freeze_info.freeze_ts;

4
src/storage/tablet/ob_tablet_table_store.cpp
View File

@ -799,11 +799,11 @@ int ObTabletTableStore::build_minor_tables(
ObSSTable *new_sstable = static_cast<ObSSTable *>(new_table);
if (sstable->get_meta().get_basic_meta().max_merged_trans_version_
< new_sstable->get_meta().get_basic_meta().max_merged_trans_version_) {
need_add = true;
need_add = false;
LOG_INFO("new sstable max merge trans version not equal to old sstable, "
"need add new sstable when table key is same", KPC(sstable), KPC(new_sstable));
} else {
need_add = false;
need_add = true; // just keep old sstable
}
} else if (ObTableStoreUtil::check_include_by_log_ts_range(*new_table, *table)) {
LOG_DEBUG("table purged", K(*new_table), K(*table));