destruct row meta when px ms close && do not rewrite some error code for view resolver

This commit is contained in:
18523270951@163.com 2023-12-25 04:47:34 +00:00 committed by ob-robot
parent 4b81b2d79b
commit e49b957a84
3 changed files with 6 additions and 2 deletions

View File

@ -1145,7 +1145,9 @@ bool ObTableColumns::can_rewrite_error_code(const int ret)
{ {
bool res = true; bool res = true;
if (OB_ALLOCATE_MEMORY_FAILED == ret if (OB_ALLOCATE_MEMORY_FAILED == ret
|| OB_SQL_RESOLVER_NO_MEMORY == ret) { || OB_SQL_RESOLVER_NO_MEMORY == ret
|| OB_TIMEOUT == ret
|| OB_EAGAIN == ret) {
res = false; res = false;
} }
return res; return res;

View File

@ -106,7 +106,7 @@ ObPxMSCoordVecOp::ObPxMSCoordVecOp(ObExecContext &exec_ctx, const ObOpSpec &spec
reader_cnt_(0), reader_cnt_(0),
alloc_(), alloc_(),
single_row_brs_(), single_row_brs_(),
output_store_(&exec_ctx.get_allocator()) output_store_()
{ {
} }
@ -117,6 +117,7 @@ void ObPxMSCoordVecOp::destroy()
store_rows_.reset(); store_rows_.reset();
destroy_readers(); destroy_readers();
alloc_.reset(); alloc_.reset();
output_store_.~ObTempRowStore();
// no need to reset receive_order_ // no need to reset receive_order_
// no need to reset interrupt_proc_ // no need to reset interrupt_proc_
// no need to reset sqc_init_msg_proc_ // no need to reset sqc_init_msg_proc_

View File

@ -72,6 +72,7 @@ ObPxMSReceiveVecOp::ObPxMSReceiveVecOp(ObExecContext &exec_ctx, const ObOpSpec &
void ObPxMSReceiveVecOp::destroy() void ObPxMSReceiveVecOp::destroy()
{ {
sql_mem_processor_.unregister_profile_if_necessary(); sql_mem_processor_.unregister_profile_if_necessary();
output_store_.~ObTempRowStore();
if (nullptr != mem_context_) { if (nullptr != mem_context_) {
DESTROY_CONTEXT(mem_context_); DESTROY_CONTEXT(mem_context_);
mem_context_ = nullptr; mem_context_ = nullptr;