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

Fix FastParserRes memory leak caused by remote plan

Browse Source
This commit is contained in:
lf0
2022-03-17 15:10:54 +08:00
committed by LINxiansheng
parent a5c703acc4
commit 9aa337ba9e
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/ob_sql.cpp
View File

@ -1071,6 +1071,9 @@ int ObSql::handle_remote_query(const ObRemoteSqlInfo &remote_sql_info, ObSqlCtx
// is recorded on the control server, and there is no need to record it here // is recorded on the control server, and there is no need to record it here
// Otherwise it will cause repeated warning messages // Otherwise it will cause repeated warning messages
ob_reset_tsi_warning_buffer(); ob_reset_tsi_warning_buffer();
if (NULL != pc_ctx) {
pc_ctx->~ObPlanCacheCtx();
}
return ret; return ret;
} }
@ -1216,13 +1219,9 @@ inline int ObSql::handle_text_query(const ObString &stmt, ObSqlCtx &context, ObR
LOG_WARN("fail to handle after get plan", K(ret)); LOG_WARN("fail to handle after get plan", K(ret));
} }
} }
// for inner sql, release the optimization memory
if (!THIS_WORKER.has_req_flag()) {
// only for inner sql
if (NULL != pc_ctx) { if (NULL != pc_ctx) {
pc_ctx->~ObPlanCacheCtx(); pc_ctx->~ObPlanCacheCtx();
} }
}
return ret; return ret;
} }

11
src/sql/plan_cache/ob_plan_cache_util.h
View File

@ -385,14 +385,17 @@ struct ObPCParamEqualInfo {
}; };
struct ObFastParserResult { struct ObFastParserResult {
private:
common::ModulePageAllocator inner_alloc_;
public:
ObFastParserResult() ObFastParserResult()
: inner_alloc_("FastParserRes"), raw_params_(&inner_alloc_), ps_params_(&inner_alloc_), cache_params_(NULL) : inner_alloc_("FastParserRes"), raw_params_(&inner_alloc_), ps_params_(&inner_alloc_), cache_params_(NULL)
{} {}
ObPlanCacheKey pc_key_; // plan cache key, parameterized by fast parser ObPlanCacheKey pc_key_; // plan cache key, parameterized by fast parser
common::ModulePageAllocator inner_alloc_; common::ObFixedArray<ObPCParam *, common::ObIAllocator> raw_params_;
common::ObFixedArray<ObPCParam*, common::ObIAllocator> raw_params_; common::ObFixedArray<const common::ObObjParam *, common::ObIAllocator> ps_params_;
common::ObFixedArray<const common::ObObjParam*, common::ObIAllocator> ps_params_; ParamStore *cache_params_;
ParamStore* cache_params_;
void reset() void reset()
{ {
pc_key_.reset(); pc_key_.reset();