Fix direct load reset mem_ctx

This commit is contained in:
obdev
2024-02-08 19:21:42 +00:00
committed by ob-robot
parent 44315c82f4
commit 2e47168229
2 changed files with 9 additions and 6 deletions

View File

@ -575,9 +575,6 @@ int ObTableLoadMemCompactor::finish()
LOG_WARN("fail to start parallel merge", KR(ret)); LOG_WARN("fail to start parallel merge", KR(ret));
} }
} }
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy,需要提前释放
}
return ret; return ret;
} }
@ -608,6 +605,9 @@ int ObTableLoadMemCompactor::build_result_for_heap_table()
} }
} }
} }
if (OB_SUCC(ret)) {
mem_ctx_.reset();
}
return ret; return ret;
} }
@ -625,6 +625,9 @@ int ObTableLoadMemCompactor::add_table_to_parallel_merge_ctx()
LOG_WARN("fail to add tablet sstable", KR(ret)); LOG_WARN("fail to add tablet sstable", KR(ret));
} }
} }
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy,需要提前释放
}
return ret; return ret;
} }

View File

@ -496,9 +496,6 @@ int ObTableLoadMultipleHeapTableCompactor::finish()
} else if (OB_FAIL(compact_ctx_->handle_table_compact_success())) { } else if (OB_FAIL(compact_ctx_->handle_table_compact_success())) {
LOG_WARN("fail to handle_table_compact_success", KR(ret)); LOG_WARN("fail to handle_table_compact_success", KR(ret));
} }
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy,需要提前释放
}
return ret; return ret;
} }
@ -529,6 +526,9 @@ int ObTableLoadMultipleHeapTableCompactor::build_result_for_heap_table()
} }
} }
} }
if (OB_SUCC(ret)) {
mem_ctx_.reset(); // mem_ctx的tables已经copy,需要提前释放
}
return ret; return ret;
} }