提交 c259349b 编写于 作者: O obdev 提交者: wangzelin.wzl

fix add minor table to table store

上级 cbeae2bf
...@@ -490,7 +490,7 @@ int ObTenantFreezeInfoMgr::diagnose_min_reserved_snapshot( ...@@ -490,7 +490,7 @@ int ObTenantFreezeInfoMgr::diagnose_min_reserved_snapshot(
ret = OB_SUCCESS; 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"; snapshot_from_type = "undo_retention";
if (freeze_info.freeze_ts < snapshot_version) { if (freeze_info.freeze_ts < snapshot_version) {
snapshot_version = freeze_info.freeze_ts; snapshot_version = freeze_info.freeze_ts;
......
...@@ -799,11 +799,11 @@ int ObTabletTableStore::build_minor_tables( ...@@ -799,11 +799,11 @@ int ObTabletTableStore::build_minor_tables(
ObSSTable *new_sstable = static_cast<ObSSTable *>(new_table); ObSSTable *new_sstable = static_cast<ObSSTable *>(new_table);
if (sstable->get_meta().get_basic_meta().max_merged_trans_version_ if (sstable->get_meta().get_basic_meta().max_merged_trans_version_
< new_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, " 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)); "need add new sstable when table key is same", KPC(sstable), KPC(new_sstable));
} else { } else {
need_add = false; need_add = true; // just keep old sstable
} }
} else if (ObTableStoreUtil::check_include_by_log_ts_range(*new_table, *table)) { } else if (ObTableStoreUtil::check_include_by_log_ts_range(*new_table, *table)) {
LOG_DEBUG("table purged", K(*new_table), K(*table)); LOG_DEBUG("table purged", K(*new_table), K(*table));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册