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

fix merge set op last_store_row dynamic leak

Browse Source
This commit is contained in:
obdev
2023-05-08 04:08:29 +00:00
committed by ob-robot
parent c8b3ff602c
commit 8331f2f878
10 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/engine/aggregate/ob_aggregate_processor.cpp
View File

@ -759,7 +759,8 @@ ObAggregateProcessor::DllUdfExtra::~DllUdfExtra()
ObAggregateProcessor::ObAggregateProcessor(ObEvalCtx &eval_ctx,
ObIArray<ObAggrInfo> &aggr_infos,
const lib::ObLabel &label,
ObMonitorNode &op_monitor_info)
ObMonitorNode &op_monitor_info,
const int64_t tenant_id)
: has_distinct_(false),
has_order_by_(false),
has_group_concat_(false),
@ -768,7 +769,7 @@ ObAggregateProcessor::ObAggregateProcessor(ObEvalCtx &eval_ctx,
eval_ctx_(eval_ctx),
aggr_alloc_(label,
common::OB_MALLOC_MIDDLE_BLOCK_SIZE,
OB_SERVER_TENANT_ID,
tenant_id,
ObCtxIds::WORK_AREA),
cur_batch_group_idx_(0),
cur_batch_group_buf_(nullptr),

3
src/sql/engine/aggregate/ob_aggregate_processor.h
View File

@ -624,7 +624,8 @@ public:
ObAggregateProcessor(ObEvalCtx &eval_ctx,
ObIArray<ObAggrInfo> &aggr_infos,
const lib::ObLabel &label,
ObMonitorNode &op_monitor_info);
ObMonitorNode &op_monitor_info,
const int64_t tenant_id);
~ObAggregateProcessor() { destroy(); };
int init();

3
src/sql/engine/aggregate/ob_groupby_op.h
View File

@ -69,7 +69,8 @@ public:
aggr_processor_(eval_ctx_,
(static_cast<ObGroupBySpec &>(const_cast<ObOpSpec &>(spec))).aggr_infos_,
ObModIds::OB_SQL_AGGR_FUNC_ROW,
op_monitor_info_)
op_monitor_info_,
exec_ctx.get_my_session()->get_effective_tenant_id())
{
}
inline ObAggregateProcessor &get_aggr_processor() { return aggr_processor_; }

2
src/sql/engine/aggregate/ob_merge_distinct_op.cpp
View File

@ -33,7 +33,7 @@ ObMergeDistinctOp::ObMergeDistinctOp(ObExecContext &exec_ctx, const ObOpSpec &sp
: ObOperator(exec_ctx, spec, input),
first_got_row_(true),
alloc_(ObModIds::OB_SQL_MERGE_GROUPBY,
OB_MALLOC_NORMAL_BLOCK_SIZE, OB_SERVER_TENANT_ID, ObCtxIds::WORK_AREA),
OB_MALLOC_NORMAL_BLOCK_SIZE, exec_ctx.get_my_session()->get_effective_tenant_id(), ObCtxIds::WORK_AREA),
last_row_(alloc_)
{
}