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

revert set_tablet_handle && fix ddl_merge iter

Browse Source
This commit is contained in:
renju96
2024-02-09 09:53:49 +00:00
committed by ob-robot
parent e56b2548ac
commit c477d5e2e5
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/blocksstable/index_block/ob_ddl_index_block_row_iterator.cpp
View File

@ -1201,8 +1201,8 @@ int ObDDLMergeBlockRowIterator::get_readable_ddl_kvs(const ObIndexBlockIterParam
} else { } else {
for (int64_t i = 0; OB_SUCC(ret) && i < ddl_kvs.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < ddl_kvs.count(); ++i) {
ObDDLKV *ddl_kv = ddl_kvs.at(i); ObDDLKV *ddl_kv = ddl_kvs.at(i);
bool skip = false;
for (int64_t j = 0; OB_SUCC(ret) && j < ddl_kv->get_ddl_memtables().count(); ++j) { for (int64_t j = 0; OB_SUCC(ret) && j < ddl_kv->get_ddl_memtables().count(); ++j) {
bool skip = false;
ObDDLMemtable *cur_ddl_memtable = ddl_kv->get_ddl_memtables().at(j); ObDDLMemtable *cur_ddl_memtable = ddl_kv->get_ddl_memtables().at(j);
if (OB_NOT_NULL(cur_ddl_memtable)) { if (OB_NOT_NULL(cur_ddl_memtable)) {
if (cur_ddl_memtable->is_table_with_scn_range() && OB_NOT_NULL(iter_param.sstable_)) { if (cur_ddl_memtable->is_table_with_scn_range() && OB_NOT_NULL(iter_param.sstable_)) {

1
src/storage/tablet/ob_tablet.cpp
View File

@ -3926,7 +3926,6 @@ int ObTablet::do_rowkey_exists(
bool found = false; bool found = false;
ObITable *table = nullptr; ObITable *table = nullptr;
int64_t check_table_cnt = 0; int64_t check_table_cnt = 0;
param.set_tablet_handle(table_iter.get_tablet_handle_ptr());
while (OB_SUCC(ret) && !found) { while (OB_SUCC(ret) && !found) {
if (OB_FAIL(table_iter.table_store_iter_.get_next(table))) { if (OB_FAIL(table_iter.table_store_iter_.get_next(table))) {
if (OB_ITER_END != ret) { if (OB_ITER_END != ret) {