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

build ha ddl sstable ignore expired one

Browse Source 
Co-authored-by: obdev <obdev@oceanbase.com>
This commit is contained in:
simonjoylet
2023-01-28 13:43:29 +08:00
committed by ob-robot
parent b2607a0ccf
commit 01439af346
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/ddl/ob_ddl_merge_task.cpp
View File

@ -798,9 +798,9 @@ int ObTabletDDLUtil::report_ddl_checksum(const share::ObLSID &ls_id,
ObArray<ObDDLChecksumItem> ddl_checksum_items;
if (OB_FAIL(table_schema->get_multi_version_column_descs(column_ids))) {
LOG_WARN("fail to get column ids", K(ret), K(ls_id), K(tablet_id));
} else if (OB_UNLIKELY(column_checksums.count() != column_ids.count())) {
} else if (OB_UNLIKELY(column_checksums.count() > column_ids.count())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpect error, column checksums count didn't equal to column ids count", K(ret),
LOG_WARN("unexpect error, column checksums count larger than column ids count", K(ret),
K(ls_id), K(tablet_id), K(column_checksums.count()), K(column_ids.count()));
}
for (int64_t i = 0; OB_SUCC(ret) && i < column_checksums.count(); ++i) {

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

@ -1460,6 +1460,8 @@ int ObTabletTableStore::build_ha_ddl_tables_(
break;
} else if (!new_table->is_ddl_sstable()) {
//do nothing
} else if (static_cast<ObSSTable *>(new_table)->get_meta().get_basic_meta().ddl_scn_ < tablet_ptr_->get_tablet_meta().ddl_start_scn_) {
// the ddl start scn is old, drop it
} else if (OB_NOT_NULL(last_ddl_table) && new_table->get_start_scn() != last_ddl_table->get_end_scn()) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ddl table is not continue", K(ret), K(param), K(old_store));