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

to issue<2024102800104832500>:fix xmltype into basic var core

Browse Source
This commit is contained in:
hanr881 2024-11-01 06:15:25 +00:00 committed by ob-robot
parent 4481ef728c
commit 59eeb81186
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pl/ob_pl_code_generator.cpp
View File

@ -5270,7 +5270,11 @@ int ObPLCodeGenerator::generate_fetch(const ObPLStmt &s,
OZ (store_data_type(*(pl_data_type->get_data_type()), type_value));
} else { // 构造函数场景
ObDataType ext_type;
ext_type.set_obj_type(ObExtendType);
ObObjMeta meta;
meta.set_type(ObExtendType);
meta.set_extend_type(pl_data_type->get_type());
ext_type.set_meta_type(meta);
ext_type.set_udt_id(pl_data_type->get_user_type_id());
OZ (store_data_type(ext_type, type_value));
}
}

12
src/sql/ob_spi.cpp
View File

@ -7403,9 +7403,12 @@ int ObSPIService::convert_obj(ObPLExecCtx *ctx,
|| obj.is_null())
&& (result_type.get_type() == ObExtendType
|| ob_is_xml_sql_type(result_type.get_type(), result_type.get_subschema_id())))
|| (obj.get_meta().is_geometry() && lib::is_oracle_mode() && result_type.get_type() != ObExtendType)) {
|| (obj.get_meta().is_geometry() && lib::is_oracle_mode() && result_type.get_type() != ObExtendType)
|| (obj.is_null() && current_type.at(i).get_meta_type().is_xml_sql_type()
&& !ob_is_xml_pl_type(result_type.get_type(), result_type.get_accuracy().get_accuracy())
&& !ob_is_string_tc(result_type.get_type()))) {
ret = OB_ERR_INVALID_TYPE_FOR_OP;
LOG_WARN("xml type can not convert other type in pl", K(ret));
LOG_WARN("xml type can not convert other type in pl", K(ret), K(obj), K(current_type.at(i)), K(i), K(result_type));
} else if (result_type.is_ext()
&& (result_type.get_accuracy().get_accuracy() == 300004 ||
result_type.get_accuracy().get_accuracy() == 300005)
@ -7416,8 +7419,9 @@ int ObSPIService::convert_obj(ObPLExecCtx *ctx,
} else if (OB_FAIL(ObExprColumnConv::convert_with_null_check(tmp_obj, obj, result_type, is_strict, cast_ctx, type_info))) {
LOG_WARN("fail to convert with null check", K(ret));
} else if (tmp_obj.is_null()) {
if (current_type.at(i).get_meta_type().is_xml_sql_type()
|| (current_type.at(i).get_meta_type().is_ext() && current_type.at(i).get_accuracy().get_accuracy() == T_OBJ_XML)) {
if (!ob_is_string_tc(result_type.get_type()) &&
(current_type.at(i).get_meta_type().is_xml_sql_type()
|| (current_type.at(i).get_meta_type().is_ext() && current_type.at(i).get_accuracy().get_accuracy() == T_OBJ_XML))) {
#ifdef OB_BUILD_ORACLE_PL
ObPLOpaque *opaque = reinterpret_cast<ObPLOpaque*>(cast_ctx.allocator_v2_->alloc(sizeof(ObPLOpaque)));;
if (OB_ISNULL(opaque)) {