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

[C] fix deal_with_tables [3.1_opensource_release < 3_1_x_release]

Browse Source
This commit is contained in:
lx0 2021-12-10 13:43:04 +08:00 committed by LINxiansheng
parent 66238908e3
commit 2b64e56aff
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/storage/ob_multiple_merge.cpp
View File

@ -270,9 +270,16 @@ int ObMultipleMerge::deal_with_tables(ObTableAccessContext& context, ObTablesHan
read_memtable_only_ = true;
}
if (result_tables.count() != tables_handle_.get_count()) {
tables_handle_.reset_tables();
if (OB_FAIL(tables_handle_.add_tables(result_tables))) {
ObTablesHandle tmp_table_handles;
if (OB_FAIL(tmp_table_handles.add_tables(result_tables))) {
STORAGE_LOG(WARN, "failed to push result tables into tables handle", K(ret), K(result_tables));
} else {
tables_handle_.reset_tables();
if (OB_FAIL(tables_handle_.assign(tmp_table_handles))) {
STORAGE_LOG(WARN, "failed assgin tables handle", K(ret));
} else if (memtable_cnt > 0) {
tables_handle_.set_retire_check();
}
}
}
}