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

[CP] to issue<2024102800104841843>:fix package record nested record serialize core

Browse Source
This commit is contained in:
hanr881 2025-01-02 18:46:10 +00:00 committed by ob-robot
parent 94aa4524c8
commit f82ae4157c
4 changed files with 42 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/pl/ob_pl_package.cpp
View File

@ -254,36 +254,10 @@ int ObPLPackage::instantiate_package_state(const ObPLResolveCtx &resolve_ctx,
// set basic type value inside symbol table to null
OZ (package_state.set_package_var_val(var_idx, value, resolve_ctx, false));
} else {
OZ (ObUserDefinedType::destruct_obj(value, &(resolve_ctx.session_info_), true));
if (OB_SUCC(ret) && var_type.is_record_type() && PL_RECORD_TYPE == value.get_meta().get_extend_type()) {
const ObUserDefinedType *user_type = NULL;
const ObRecordType *record_type = NULL;
ObObj *member = NULL;
ObPLRecord *record = reinterpret_cast<ObPLRecord *>(value.get_ext());
CK (OB_NOT_NULL(record));
OZ (var_type.get_external_user_type(resolve_ctx, user_type), KPC(this));
CK (OB_NOT_NULL(user_type));
CK (OB_NOT_NULL(record_type = static_cast<const ObRecordType *>(user_type)));
for (int64_t i = 0; OB_SUCC(ret) && i < record_type->get_member_count(); ++i) {
const ObRecordMember* record_member = record_type->get_record_member(i);
const ObPLDataType* member_type = record_type->get_record_member_type(i);
CK (OB_NOT_NULL(record_type->get_member(i)));
OZ (record->get_element(i, member));
CK (OB_NOT_NULL(member));
CK (OB_NOT_NULL(record_member));
CK (OB_NOT_NULL(member_type));
if (OB_SUCC(ret)) {
if (record_type->get_member(i)->is_obj_type()) {
OX (new (member) ObObj(ObNullType));
} else {
int64_t init_size = OB_INVALID_SIZE;
int64_t member_ptr = 0;
OZ (record_type->get_member(i)->get_size(PL_TYPE_INIT_SIZE, init_size));
OZ (record_type->get_member(i)->newx(*record->get_allocator(), &resolve_ctx, member_ptr));
OX (member->set_extend(member_ptr, record_type->get_member(i)->get_type(), init_size));
}
}
}
if (var_type.is_record_type() && PL_RECORD_TYPE == value.get_meta().get_extend_type()) {
OZ (ObUserDefinedType::reset_record(value, NULL));
} else {
OZ (ObUserDefinedType::destruct_obj(value, &(resolve_ctx.session_info_), true));
}
}
OZ (var_type.deserialize(resolve_ctx,

37
src/pl/ob_pl_package_state.cpp
View File

@ -223,38 +223,11 @@ int ObPLPackageState::set_package_var_val(const int64_t var_idx,
&& types_.at(var_idx) != PL_CURSOR_TYPE
&& types_.at(var_idx) != PL_REF_CURSOR_TYPE) {
CK (vars_.at(var_idx).get_ext() != 0);
OZ (ObUserDefinedType::destruct_obj(vars_.at(var_idx), NULL, true));
if (OB_SUCC(ret) && PL_RECORD_TYPE == types_.at(var_idx)) {
const ObUserDefinedType *user_type = NULL;
const ObRecordType *record_type = NULL;
ObObj *member = NULL;
ObPLRecord *record = reinterpret_cast<ObPLRecord *>(vars_.at(var_idx).get_ext());
int64_t udt_id = OB_INVALID_ID;
CK (OB_NOT_NULL(record));
OX (udt_id = record->get_id());
OZ (resolve_ctx.get_user_type(udt_id, user_type));
CK (OB_NOT_NULL(user_type));
CK (OB_NOT_NULL(record_type = static_cast<const ObRecordType *>(user_type)));
for (int64_t i = 0; OB_SUCC(ret) && i < record_type->get_member_count(); ++i) {
const ObRecordMember* record_member = record_type->get_record_member(i);
const ObPLDataType* member_type = record_type->get_record_member_type(i);
CK (OB_NOT_NULL(record_type->get_member(i)));
OZ (record->get_element(i, member));
CK (OB_NOT_NULL(member));
CK (OB_NOT_NULL(record_member));
CK (OB_NOT_NULL(member_type));
if (OB_SUCC(ret)) {
if (record_type->get_member(i)->is_obj_type()) {
OX (new (member) ObObj(ObNullType));
} else {
int64_t init_size = OB_INVALID_SIZE;
int64_t member_ptr = 0;
OZ (record_type->get_member(i)->get_size(PL_TYPE_INIT_SIZE, init_size));
OZ (record_type->get_member(i)->newx(*record->get_allocator(), &resolve_ctx, member_ptr));
OX (member->set_extend(member_ptr, record_type->get_member(i)->get_type(), init_size));
}
}
}
if (OB_FAIL(ret)) {
} else if (PL_RECORD_TYPE == types_.at(var_idx)) {
OZ (ObUserDefinedType::reset_record(vars_.at(var_idx), NULL));
} else {
OZ (ObUserDefinedType::destruct_obj(vars_.at(var_idx), NULL, true));
}
} else {
vars_.at(var_idx) = value;

32
src/pl/ob_pl_user_type.cpp
View File

@ -323,6 +323,38 @@ int ObUserDefinedType::destruct_objparam(ObIAllocator &alloc, ObObj &src, ObSQLS
return ret;
}
int ObUserDefinedType::reset_record(ObObj &src, ObSQLSessionInfo *session)
{
int ret = OB_SUCCESS;
ObPLRecord *record = reinterpret_cast<ObPLRecord*>(src.get_ext());
CK (OB_NOT_NULL(record));
if (OB_SUCC(ret) && OB_NOT_NULL(record->get_allocator())) {
ObPLAllocator1 *pl_allocator = dynamic_cast<ObPLAllocator1 *>(record->get_allocator());
CK (OB_NOT_NULL(pl_allocator));
for (int64_t i = 0; OB_SUCC(ret) && i < record->get_count(); ++i) {
ObObj &obj = record->get_element()[i];
if (obj.is_pl_extend()) {
int8_t extend_type = obj.get_meta().get_extend_type();
if (PL_RECORD_TYPE == extend_type) {
OZ (SMART_CALL(reset_record(obj, session)));
} else if (PL_NESTED_TABLE_TYPE == extend_type ||
PL_ASSOCIATIVE_ARRAY_TYPE == extend_type ||
PL_VARRAY_TYPE == extend_type) {
OZ (SMART_CALL(destruct_obj(obj, session, true)));
} else {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected type", K(ret), K(obj), K(extend_type), KPC(record));
}
} else {
OZ (SMART_CALL(destruct_objparam(*pl_allocator, obj, session, true)));
}
}
}
return ret;
}
// keep_composite_attr = true, 保留其allocator属性，对于record而言，保留data域
// 否则, 所有内存都清理
int ObUserDefinedType::destruct_obj(ObObj &src, ObSQLSessionInfo *session, bool keep_composite_attr)

1
src/pl/ob_pl_user_type.h
View File

@ -152,6 +152,7 @@ public:
static int deep_copy_obj(
ObIAllocator &allocator, const ObObj &src, ObObj &dst, bool need_new_allocator = true, bool ignore_del_element = false);
static int destruct_objparam(ObIAllocator &alloc, ObObj &src, sql::ObSQLSessionInfo *session = nullptr, bool direct_use_alloc = false);
static int reset_record(ObObj &src, sql::ObSQLSessionInfo *session);
static int destruct_obj(ObObj &src, sql::ObSQLSessionInfo *session = NULL, bool keep_composite_attr = false);
static int alloc_sub_composite(ObObj &dest_element, ObIAllocator &allocator);
static int alloc_for_second_level_composite(ObObj &src, ObIAllocator &allocator);