revert set_tablet_handle && fix ddl_merge iter
This commit is contained in:
parent
cf72e15cd1
commit
d14882657a
@ -1201,8 +1201,8 @@ int ObDDLMergeBlockRowIterator::get_readable_ddl_kvs(const ObIndexBlockIterParam
|
||||
} else {
|
||||
for (int64_t i = 0; OB_SUCC(ret) && i < ddl_kvs.count(); ++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) {
|
||||
bool skip = false;
|
||||
ObDDLMemtable *cur_ddl_memtable = ddl_kv->get_ddl_memtables().at(j);
|
||||
if (OB_NOT_NULL(cur_ddl_memtable)) {
|
||||
if (cur_ddl_memtable->is_table_with_scn_range() && OB_NOT_NULL(iter_param.sstable_)) {
|
||||
|
@ -3926,7 +3926,6 @@ int ObTablet::do_rowkey_exists(
|
||||
bool found = false;
|
||||
ObITable *table = nullptr;
|
||||
int64_t check_table_cnt = 0;
|
||||
param.set_tablet_handle(table_iter.get_tablet_handle_ptr());
|
||||
while (OB_SUCC(ret) && !found) {
|
||||
if (OB_FAIL(table_iter.table_store_iter_.get_next(table))) {
|
||||
if (OB_ITER_END != ret) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user