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

[CP] fix serialize ObSqlArrayObj bugs

Browse Source
This commit is contained in:
jingtaoye35
2024-02-08 19:27:43 +00:00
committed by ob-robot
parent d2633c10e1
commit 426469c057
10 changed files with 239 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/sql/engine/ob_physical_plan_ctx.cpp
View File

@ -949,22 +949,6 @@ OB_DEF_DESERIALIZE(ObPhysicalPlanCtx)
}
}
}
if (OB_SUCC(ret) && array_group_count > 0 &&
datum_param_store_.count() == 0 &&
datum_param_store_.count() != param_store_.count()) {
if (OB_FAIL(datum_param_store_.prepare_allocate(param_store_.count()))) {
LOG_WARN("fail to prepare allocate", K(ret), K(param_store_.count()));
}
for (int64_t i = 0; OB_SUCC(ret) && i < param_store_.count(); i++) {
ObDatumObjParam &datum_param = datum_param_store_.at(i);
if (OB_FAIL(datum_param.alloc_datum_reserved_buff(
param_store_.at(i).meta_, param_store_.at(i).get_precision(), allocator_))) {
LOG_WARN("alloc datum reserved buffer failed", K(ret));
} else if (OB_FAIL(datum_param.from_objparam(param_store_.at(i), &allocator_))) {
LOG_WARN("fail to convert obj param", K(ret), K(param_store_.at(i)));
}
}
}
OB_UNIS_DECODE(enable_rich_format_);
OB_UNIS_DECODE(local_var_array_cnt);
if (OB_SUCC(ret)) {
@ -984,6 +968,15 @@ OB_DEF_DESERIALIZE(ObPhysicalPlanCtx)
OB_UNIS_DECODE(*local_vars);
}
}
// following is not deserialize, please add deserialize ahead.
if (OB_SUCC(ret) && array_group_count > 0 &&
datum_param_store_.count() == 0 &&
datum_param_store_.count() != param_store_.count()) {
if (OB_FAIL(init_param_store_after_deserialize())) {
LOG_WARN("failed to deserialize param store", K(ret));
}
}
return ret;
}
@ -1041,5 +1034,40 @@ int ObPhysicalPlanCtx::get_local_session_vars(int64_t local_var_array_id, const
return ret;
}
// white list: init param_store after deserialize which it's needed really.
int ObPhysicalPlanCtx::init_param_store_after_deserialize()
{
int ret = OB_SUCCESS;
datum_param_store_.reuse();
if (OB_FAIL(datum_param_store_.prepare_allocate(param_store_.count()))) {
LOG_WARN("fail to prepare allocate", K(ret), K(param_store_.count()));
}
for (int64_t i = 0; OB_SUCC(ret) && i < param_store_.count(); i++) {
ObObjParam &obj_param = param_store_.at(i);
ObDatumObjParam &datum_param = datum_param_store_.at(i);
if (obj_param.is_ext_sql_array()) {
ObSqlArrayObj *array_obj = NULL;
if (OB_FAIL(ObSqlArrayObj::do_real_deserialize(allocator_,
reinterpret_cast<char *>(obj_param.get_ext()),
obj_param.get_val_len(),
array_obj))) {
LOG_WARN("failed to alloc array_obj after decode", K(ret));
} else {
obj_param.set_extend(reinterpret_cast<int64_t>(array_obj), T_EXT_SQL_ARRAY);
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(datum_param.alloc_datum_reserved_buff(obj_param.meta_,
obj_param.get_precision(),
allocator_))) {
LOG_WARN("alloc datum reserved buffer failed", K(ret));
} else if (OB_FAIL(datum_param.from_objparam(obj_param, &allocator_))) {
LOG_WARN("fail to convert obj param", K(ret), K(obj_param));
}
}
}
return ret;
}
} //sql
} //oceanbase

1
src/sql/engine/ob_physical_plan_ctx.h
View File

@ -466,6 +466,7 @@ public:
int set_all_local_session_vars(ObIArray<ObLocalSessionVar> &all_local_session_vars);
int get_local_session_vars(int64_t idx, const ObLocalSessionVar *&local_vars);
private:
int init_param_store_after_deserialize();
void reset_datum_frame(char *frame, int64_t expr_cnt);
int extend_param_frame(const int64_t old_size);
int reserve_param_frame(const int64_t capacity);