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

fix case failed cause by information_schema enhance

Browse Source
This commit is contained in:
obdev
2023-02-07 11:52:26 +08:00
committed by ob-robot
parent e9b85c65a0
commit de327e58f9
14 changed files with 119 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/sql/engine/expr/ob_datum_cast.cpp
View File

@ -7682,6 +7682,7 @@ int get_accuracy_from_parse_node(const ObExpr &expr, ObEvalCtx &ctx,
{
int ret = OB_SUCCESS;
ObDatum *dst_type_dat = NULL;
ObExprResType dst_type;
if (OB_UNLIKELY(2 != expr.arg_cnt_) || OB_ISNULL(expr.args_) ||
OB_ISNULL(expr.args_[1])) {
ret = OB_ERR_UNEXPECTED;
@ -7689,9 +7690,28 @@ int get_accuracy_from_parse_node(const ObExpr &expr, ObEvalCtx &ctx,
} else if (OB_FAIL(expr.args_[1]->eval(ctx, dst_type_dat))) {
LOG_WARN("eval dst type datum failed", K(ret));
} else {
int64_t maxblen = ObCharset::CharConvertFactorNum;
ParseNode node;
node.value_ = dst_type_dat->get_int();
dest_type = static_cast<ObObjType>(node.int16_values_[0]);
ObObjType obj_type = static_cast<ObObjType>(node.int16_values_[OB_NODE_CAST_TYPE_IDX]);
dst_type.set_collation_type(static_cast<ObCollationType>(node.int16_values_[OB_NODE_CAST_COLL_IDX]));
dst_type.set_type(obj_type);
int64_t text_length = node.int32_values_[1];
if (lib::is_mysql_mode() && !dst_type.is_binary() && !dst_type.is_varbinary()) {
dst_type.set_full_length(node.int32_values_[OB_NODE_CAST_C_LEN_IDX], expr.datum_meta_.length_semantics_);
if (dst_type.get_length() > OB_MAX_CAST_CHAR_VARCHAR_LENGTH && dst_type.get_length() <= OB_MAX_CAST_CHAR_TEXT_LENGTH) {
dst_type.set_type(ObTextType);
dst_type.set_length(OB_MAX_CAST_CHAR_TEXT_LENGTH);
} else if (dst_type.get_length() > OB_MAX_CAST_CHAR_TEXT_LENGTH && dst_type.get_length() <= OB_MAX_CAST_CHAR_MEDIUMTEXT_LENGTH) {
dst_type.set_type(ObMediumTextType);
dst_type.set_length(OB_MAX_CAST_CHAR_MEDIUMTEXT_LENGTH);
} else if (dst_type.get_length() > OB_MAX_CAST_CHAR_MEDIUMTEXT_LENGTH) {
dst_type.set_type(ObLongTextType);
dst_type.set_length(OB_MAX_LONGTEXT_LENGTH / maxblen);
}
text_length = dst_type.get_length();
}
dest_type = dst_type.get_type();
ObObjTypeClass dest_tc = ob_obj_type_class(dest_type);
if (ObStringTC == dest_tc) {
// parser will abort all negative number
@ -7701,8 +7721,8 @@ int get_accuracy_from_parse_node(const ObExpr &expr, ObEvalCtx &ctx,
} else if (ObRawTC == dest_tc) {
accuracy.set_length(node.int32_values_[1]);
} else if(ObTextTC == dest_tc || ObJsonTC == dest_tc) {
accuracy.set_length(node.int32_values_[1] < 0 ?
ObAccuracy::DDL_DEFAULT_ACCURACY[dest_type].get_length() : node.int32_values_[1]);
accuracy.set_length(text_length < 0 ?
ObAccuracy::DDL_DEFAULT_ACCURACY[dest_type].get_length() : text_length);
} else if (ObIntervalTC == dest_tc) {
if (OB_UNLIKELY(!ObIntervalScaleUtil::scale_check(node.int16_values_[3]) ||
!ObIntervalScaleUtil::scale_check(node.int16_values_[2]))) {

2
src/sql/engine/expr/ob_expr_cast.cpp
View File

@ -537,7 +537,7 @@ int ObExprCast::get_cast_type(const ObExprResType param_type2,
bool is_explicit_cast = CM_IS_EXPLICIT_CAST(cast_mode);
dst_type.set_collation_type(static_cast<ObCollationType>(parse_node.int16_values_[OB_NODE_CAST_COLL_IDX]));
dst_type.set_type(obj_type);
int64_t maxblen = 4;
int64_t maxblen = ObCharset::CharConvertFactorNum;
if (ob_is_lob_locator(obj_type)) {
// cast(x as char(10)) or cast(x as binary(10))
dst_type.set_full_length(parse_node.int32_values_[OB_NODE_CAST_C_LEN_IDX], param_type2.get_accuracy().get_length_semantics());