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

[CP] to issue<53963421>:fix pltemp mod memory leak when report 4013

Browse Source
This commit is contained in:
hanr881 2024-04-10 09:45:25 +00:00 committed by ob-robot
parent 58230ae8db
commit 6a13cb1f82
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pl/ob_pl_code_generator.cpp
View File

@ -1718,6 +1718,7 @@ int ObPLCodeGenerateVisitor::visit(const ObPLExecuteStmt &s)
int64_t udt_id = GET_USING_EXPR(i)->get_result_type().get_udt_id();
if (s.is_pure_out(i)) {
OZ (generator_.generate_new_objparam(p_result_obj, udt_id));
OZ (generator_.add_out_params(p_result_obj));
} else if (!GET_USING_EXPR(i)->is_obj_access_expr()
|| !(static_cast<const ObObjAccessRawExpr *>(GET_USING_EXPR(i))->for_write())) {
OZ (generator_.generate_expr(s.get_using_index(i), s, OB_INVALID_INDEX, p_result_obj));
@ -1740,6 +1741,7 @@ int ObPLCodeGenerateVisitor::visit(const ObPLExecuteStmt &s)
ObLLVMValue src_obj;
ObLLVMValue p_dest_obj;
OZ (generator_.generate_new_objparam(p_result_obj));
OZ (generator_.add_out_params(p_result_obj));
OZ (generator_.extract_extend_from_objparam(address, final_type, p_obj));
OZ (generator_.get_adt_service().get_obj(obj_type));
OZ (obj_type.get_pointer_to(obj_type_ptr));
@ -1756,6 +1758,7 @@ int ObPLCodeGenerateVisitor::visit(const ObPLExecuteStmt &s)
OZ (generator_.extract_allocator_from_context(
generator_.get_vars().at(generator_.CTX_IDX), allocator));
OZ (generator_.generate_new_objparam(p_result_obj, udt_id));
OZ (generator_.add_out_params(p_result_obj));
OZ (generator_.extract_obobj_ptr_from_objparam(p_result_obj, dest_datum));
OZ (generator_.extract_obobj_ptr_from_objparam(address, src_datum));
OZ (final_type.generate_copy(generator_,
@ -2585,6 +2588,7 @@ int ObPLCodeGenerateVisitor::visit(const ObPLCallStmt &s)
p_result_obj));
} else {
OZ (generator_.generate_new_objparam(p_result_obj), K(i), KPC(var));
OZ (generator_.add_out_params(p_result_obj));
}
if (OB_SUCC(ret)
&& OB_ISNULL(pl_type)
@ -2677,6 +2681,7 @@ int ObPLCodeGenerateVisitor::visit(const ObPLCallStmt &s)
ObLLVMValue src_obj;
ObLLVMValue p_dest_obj;
OZ (generator_.generate_new_objparam(p_result_obj));
OZ (generator_.add_out_params(p_result_obj));
OZ (generator_.extract_extend_from_objparam(address, final_type, p_obj));
OZ (generator_.get_adt_service().get_obj(obj_type));
OZ (obj_type.get_pointer_to(obj_type_ptr));
@ -2693,6 +2698,7 @@ int ObPLCodeGenerateVisitor::visit(const ObPLCallStmt &s)
OZ (generator_.extract_allocator_from_context(
generator_.get_vars().at(generator_.CTX_IDX), allocator));
OZ (generator_.generate_new_objparam(p_result_obj, udt_id));
OZ (generator_.add_out_params(p_result_obj));
OZ (generator_.extract_obobj_ptr_from_objparam(p_result_obj, dest_datum));
OZ (generator_.extract_obobj_ptr_from_objparam(address, src_datum));
OZ (final_type.generate_copy(generator_,
@ -7146,7 +7152,15 @@ int ObPLCodeGenerator::raise_exception(ObLLVMValue &exception,
if (OB_SUCC(ret)) {
ObLLVMValue ret_value;
ObLLVMValue exception_result;
for (int64_t i = 0; OB_SUCC(ret) && i < get_out_params().count(); ++i) {
ObLLVMValue src_datum;
jit::ObLLVMValue ret_err;
ObSEArray<jit::ObLLVMValue, 2> args;
OZ (extract_obobj_ptr_from_objparam(get_out_params().at(i), src_datum));
OZ (args.push_back(get_vars()[CTX_IDX]));
OZ (args.push_back(src_datum));
OZ (helper_.create_call(ObString("spi_destruct_obj"), get_spi_service().spi_destruct_obj_, args, ret_err));
}
/*
* 关闭从当前位置开始到目的exception位置所有For Loop Cursor
* 因为此时已经在exception过程中，只尝试关闭，不再check_success
@ -8138,12 +8152,7 @@ int ObPLCodeGenerator::generate_out_param(
s.get_block()->in_notfound(),
s.get_block()->in_warning(),
OB_INVALID_ID));
if (OB_FAIL(ret)) {
} else if (PL_CALL == s.get_type()) {
OZ (generate_destruct_obj(s, src_datum));
} else if (PL_EXECUTE == s.get_type() && param_desc.at(i).is_pure_out()) {
OZ (generate_destruct_obj(s, src_datum));
}
OZ (generate_destruct_obj(s, src_datum));
}
}
} else { //处理基础类型的出参
@ -8234,7 +8243,7 @@ int ObPLCodeGenerator::generate_out_param(
} else {
OZ (generate_destruct_obj(s, src_datum));
}
} else if (PL_EXECUTE == s.get_type() && param_desc.at(i).is_pure_out()) {
} else if (PL_EXECUTE == s.get_type()) {
OZ (generate_destruct_obj(s, src_datum));
}
}
@ -8274,6 +8283,7 @@ int ObPLCodeGenerator::generate_out_params(
OZ (generate_out_param(s, param_desc, params, i));
}
}
reset_out_params();
return ret;
}

8
src/pl/ob_pl_code_generator.h
View File

@ -189,7 +189,8 @@ public:
di_adt_service_(di_helper),
di_user_type_map_(),
debug_mode_(session_info_.is_pl_debug_on() && func_ast.is_routine()),
oracle_mode_(oracle_mode)
oracle_mode_(oracle_mode),
out_params_(allocator)
{ }
virtual ~ObPLCodeGenerator() {}
@ -783,6 +784,10 @@ public:
int generate_di_local_variable(const ObString &name, jit::ObLLVMDIType &di_type,
uint32_t arg_no, uint32_t line, jit::ObLLVMValue &value);
bool get_debug_mode() { return debug_mode_; }
inline ObPLSEArray<jit::ObLLVMValue> &get_out_params() { return out_params_; }
inline void reset_out_params() { out_params_.reset(); }
inline int add_out_params(jit::ObLLVMValue &value) { return out_params_.push_back(value); }
private:
int init_di_adt_service();
int generate_di_prototype();
@ -792,6 +797,7 @@ private:
ObLLVMDITypeMap di_user_type_map_;
bool debug_mode_;
bool oracle_mode_;
ObPLSEArray<jit::ObLLVMValue> out_params_;
};
class ObPLCodeGenerateVisitor : public ObPLStmtVisitor

2
src/sql/ob_spi.cpp
View File

@ -6528,9 +6528,9 @@ int ObSPIService::spi_destruct_obj(ObPLExecCtx *ctx,
obj->is_pl_extend() &&
obj->get_meta().get_extend_type() != pl::PL_REF_CURSOR_TYPE) {
OZ (ObUserDefinedType::destruct_obj(*obj, ctx->exec_ctx_->get_my_session()));
OX (obj->set_null());
}
SET_SPI_STATUS;
return ret;
}