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

Fix fillex tx scn do not fill ddl sstable

Browse Source
This commit is contained in:
godyangfight 2024-09-18 08:11:43 +00:00 committed by ob-robot
parent 19297a6243
commit e739a290d7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/blocksstable/ob_sstable_meta.cpp
View File

@ -1216,11 +1216,6 @@ int ObMigrationSSTableParam::deserialize_(const char *buf, const int64_t data_le
LST_DO_CODE(OB_UNIS_DECODE, is_meta_root_);
if (OB_FAIL(ret)) {
} else if (OB_FAIL(ObSSTableMetaCompactUtil::fix_filled_tx_scn_value_for_compact(table_key_, basic_meta_.filled_tx_scn_))) {
LOG_WARN("failed to fix filled tx scn value for compact", K(ret), K(table_key_), K(basic_meta_));
}
return ret;
}

8
src/storage/tablet/ob_tablet_create_sstable_param.cpp
View File

@ -426,6 +426,7 @@ int ObTabletCreateSSTableParam::init_for_ddl(blocksstable::ObSSTableIndexBuilder
nested_size_ = res.nested_size_;
nested_offset_ = res.nested_offset_;
table_shared_flag_.reset();
filled_tx_scn_ = table_key_.get_end_scn();
if (OB_FAIL(inner_init_with_merge_res(res))) {
LOG_WARN("fail to inner init with merge res", K(ret), K(res));
@ -554,6 +555,7 @@ int ObTabletCreateSSTableParam::init_for_ss_ddl(blocksstable::ObSSTableMergeRes
nested_size_ = res.nested_size_;
nested_offset_ = res.nested_offset_;
table_shared_flag_.set_shared_sstable();
filled_tx_scn_ = table_key_.get_end_scn();
if (OB_FAIL(inner_init_with_merge_res(res))) {
LOG_WARN("fail to inner init with merge res", K(ret), K(res));
} else if (table_key.is_co_sstable()) {
@ -622,6 +624,8 @@ int ObTabletCreateSSTableParam::init_for_ha(
LOG_WARN("fail to inner init with merge res", K(ret), K(res));
} else if (OB_FAIL(column_checksums_.assign(sstable_param.column_checksums_))) {
LOG_WARN("fail to fill column checksum", K(ret), K(sstable_param));
} else if (OB_FAIL(blocksstable::ObSSTableMetaCompactUtil::fix_filled_tx_scn_value_for_compact(table_key_, filled_tx_scn_))) {
LOG_WARN("failed to fix filled tx scn value for compact", K(ret), K(table_key_), K(sstable_param));
} else {
root_macro_seq_ = MAX(root_macro_seq_, sstable_param.basic_meta_.root_macro_seq_);
#ifdef OB_BUILD_SHARED_STORAGE
@ -681,6 +685,8 @@ int ObTabletCreateSSTableParam::init_for_ha(const blocksstable::ObMigrationSSTab
}
if (OB_FAIL(column_checksums_.assign(sstable_param.column_checksums_))) {
LOG_WARN("fail to assign column checksums", K(ret), K(sstable_param));
} else if (OB_FAIL(blocksstable::ObSSTableMetaCompactUtil::fix_filled_tx_scn_value_for_compact(table_key_, filled_tx_scn_))) {
LOG_WARN("failed to fix filled tx scn value for compact", K(ret), K(table_key_), K(sstable_param));
} else if (!is_valid()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("init for ha sstable get invalid argument", K(ret), K(sstable_param), KPC(this));
@ -740,6 +746,8 @@ int ObTabletCreateSSTableParam::init_for_remote(const blocksstable::ObMigrationS
MEMCPY(encrypt_key_, sstable_param.basic_meta_.encrypt_key_, share::OB_MAX_TABLESPACE_ENCRYPT_KEY_LENGTH);
if (OB_FAIL(column_checksums_.assign(sstable_param.column_checksums_))) {
LOG_WARN("fail to fill column checksum", K(ret), K(sstable_param));
} else if (OB_FAIL(blocksstable::ObSSTableMetaCompactUtil::fix_filled_tx_scn_value_for_compact(table_key_, filled_tx_scn_))) {
LOG_WARN("failed to fix filled tx scn value for compact", K(ret), K(table_key_), K(sstable_param));
} else if (!is_valid()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("init for remote sstable get invalid argument", K(ret), K(sstable_param), KPC(this));