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

[xml bugfix] Compatible error codes related to xml type

Browse Source
This commit is contained in:
obdev
2023-07-24 03:42:40 +00:00
committed by ob-robot
parent 3d29e4f19f
commit 0e36eb2f3b
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/engine/expr/ob_expr_func_part_hash.cpp
View File

@ -323,8 +323,13 @@ int ObExprFuncPartHash::eval_oracle_part_hash(
} else if (d->is_null()) {
// do nothing
} else if (!is_oracle_supported_type(arg.datum_meta_.type_)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("wrong type", K(ret), K(arg.datum_meta_));
if (ob_is_user_defined_sql_type(arg.datum_meta_.type_)) {
ret = OB_ERR_INVALID_XML_DATATYPE;
LOG_USER_ERROR(OB_ERR_INVALID_XML_DATATYPE, "-", "ANYDATA");
} else {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("wrong type", K(ret), K(arg.datum_meta_));
}
} else {
if (ObCharType == arg.datum_meta_.type_
|| ObNCharType == arg.datum_meta_.type_) {

7
src/sql/engine/expr/ob_expr_operator.cpp
View File

@ -804,7 +804,12 @@ int ObExprOperator::aggregate_charsets(
ObObjMeta coll;
for (int i = 0; OB_SUCC(ret) && i < param_num; ++i) {
coll.reset();
coll.set_collation_type(types[i].get_collation_type());
// issue:49962420 The xml type calls get_collation_type() to return the result of binary, here is set to utf8
if (type.is_string_type() && types[i].is_xml_sql_type()) {
coll.set_collation_type(ObCollationType::CS_TYPE_UTF8MB4_BIN);
} else {
coll.set_collation_type(types[i].get_collation_type());
}
coll.set_collation_level(types[i].get_collation_level());
ret = coll_types.push_back(coll);
} // end for