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

[to #46079623]fix core init trigger row use ObExecContext::allocator_

Browse Source
This commit is contained in:
seuwebber
2022-11-15 09:40:17 +00:00
committed by wangzelin.wzl
parent 3be23df8d1
commit f03ae01734
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/engine/dml/ob_trigger_handler.cpp
View File

@ -111,12 +111,12 @@ int TriggerHandle::init_trigger_params(
int64_t param_store_size = sizeof(ParamStore); int64_t param_store_size = sizeof(ParamStore);
// TODO: 这个接口还可以进一步精细化，比如在没有when条件时，tg_when_point_params_相关逻辑都不需要执行的， // TODO: 这个接口还可以进一步精细化，比如在没有when条件时，tg_when_point_params_相关逻辑都不需要执行的，
// 或者在insert/delete操作时，tg_init_point_params_也不需要执行的。 // 或者在insert/delete操作时，tg_init_point_params_也不需要执行的。
if (OB_ISNULL(when_point_params_buf = das_ctx.get_das_alloc().alloc(param_store_size)) || if (OB_ISNULL(when_point_params_buf = das_ctx.get_exec_ctx().get_allocator().alloc(param_store_size)) ||
OB_ISNULL(row_point_params_buf = das_ctx.get_das_alloc().alloc(param_store_size))) { OB_ISNULL(row_point_params_buf = das_ctx.get_exec_ctx().get_allocator().alloc(param_store_size))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to allocate memory", K(ret)); LOG_WARN("failed to allocate memory", K(ret));
} else { } else {
ObIAllocator &allocator = das_ctx.get_das_alloc(); ObIAllocator &allocator = das_ctx.get_exec_ctx().get_allocator();
trig_rtdef.tg_when_point_params_ = new(when_point_params_buf)ParamStore(ObWrapperAllocator(allocator)); trig_rtdef.tg_when_point_params_ = new(when_point_params_buf)ParamStore(ObWrapperAllocator(allocator));
trig_rtdef.tg_row_point_params_ = new(row_point_params_buf)ParamStore(ObWrapperAllocator(allocator)); trig_rtdef.tg_row_point_params_ = new(row_point_params_buf)ParamStore(ObWrapperAllocator(allocator));
OZ (trig_rtdef.tg_when_point_params_->prepare_allocate(WHEN_POINT_PARAM_COUNT)); OZ (trig_rtdef.tg_when_point_params_->prepare_allocate(WHEN_POINT_PARAM_COUNT));
@ -129,8 +129,8 @@ int TriggerHandle::init_trigger_params(
int64_t rowtype_col_count = trig_ctdef.trig_col_info_.get_rowtype_count(); int64_t rowtype_col_count = trig_ctdef.trig_col_info_.get_rowtype_count();
int64_t init_size = pl::ObRecordType::get_init_size(rowtype_col_count); int64_t init_size = pl::ObRecordType::get_init_size(rowtype_col_count);
if (trig_ctdef.all_tm_points_.has_when_condition() || trig_ctdef.all_tm_points_.has_row_point()) { if (trig_ctdef.all_tm_points_.has_when_condition() || trig_ctdef.all_tm_points_.has_row_point()) {
OZ (init_trigger_row(das_ctx.get_das_alloc(), rowtype_col_count, old_record)); OZ (init_trigger_row(das_ctx.get_exec_ctx().get_allocator(), rowtype_col_count, old_record));
OZ (init_trigger_row(das_ctx.get_das_alloc(), rowtype_col_count, new_record)); OZ (init_trigger_row(das_ctx.get_exec_ctx().get_allocator(), rowtype_col_count, new_record));
} }
LOG_DEBUG("trigger init", K(rowtype_col_count), K(ret)); LOG_DEBUG("trigger init", K(rowtype_col_count), K(ret));

6
src/sql/engine/expr/ob_expr_to_outfile_row.cpp
View File

@ -286,9 +286,9 @@ int ObExprToOutfileRow::print_wchar_to_buf(char *buf, const int64_t buf_len, int
} }
return ret; return ret;
} }
int ObExprToOutfileRow::copy_string_to_buf(char *buf, const int64_t buf_len, int64_t &pos, int ObExprToOutfileRow::copy_string_to_buf(char *buf, const int64_t buf_len, int64_t &pos,
const ObString &str) const ObString &str)
{ {
return databuff_memcpy(buf, buf_len, pos, str.length(), str.ptr()); return databuff_memcpy(buf, buf_len, pos, str.length(), str.ptr());
} }