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

[BUGFIX] fix repeat/space expr compat

Browse Source
This commit is contained in:
skylhd
2023-09-15 10:40:41 +00:00
committed by ob-robot
parent 273379cff3
commit 8f7ed1a53f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/expr/ob_expr_repeat.cpp
View File

@ -46,7 +46,11 @@ int ObExprRepeat::calc_result_type2(ObExprResType &type,
ObExprTypeCtx &type_ctx) const ObExprTypeCtx &type_ctx) const
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (!ob_is_text_tc(text.get_type()) && !text.is_null()) { if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_2_0_0) {
if (!text.is_string_type()) {
text.set_calc_type(common::ObVarcharType);
}
} else if (!ob_is_text_tc(text.get_type()) && !text.is_null()) {
text.set_calc_type(common::ObVarcharType); text.set_calc_type(common::ObVarcharType);
} }
if (!count.is_null()) { if (!count.is_null()) {

6
src/sql/engine/expr/ob_expr_space.cpp
View File

@ -37,7 +37,7 @@ inline int ObExprSpace::calc_result_type1(
// space is mysql only expr // space is mysql only expr
CK(lib::is_mysql_mode()); CK(lib::is_mysql_mode());
ObObjType res_type = ObMaxType; ObObjType res_type = ObMaxType;
if (type1.is_null()) { if (type1.is_null() || (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_2_0_0)) {
res_type = ObVarcharType; res_type = ObVarcharType;
} else if (type1.is_literal()) { } else if (type1.is_literal()) {
const ObObj &obj = type1.get_param(); const ObObj &obj = type1.get_param();
@ -63,7 +63,11 @@ inline int ObExprSpace::calc_result_type1(
type.set_collation_level(type1.get_collation_level()); type.set_collation_level(type1.get_collation_level());
type.set_collation_type(get_default_collation_type(type.get_type(), *type_ctx.get_session())); type.set_collation_type(get_default_collation_type(type.get_type(), *type_ctx.get_session()));
if (ObVarcharType == type.get_type()) { if (ObVarcharType == type.get_type()) {
if (GET_MIN_CLUSTER_VERSION() < CLUSTER_VERSION_4_2_0_0) {
type.set_length(OB_MAX_VARCHAR_LENGTH);
} else {
type.set_length(MAX_CHAR_LENGTH_FOR_VARCAHR_RESULT); type.set_length(MAX_CHAR_LENGTH_FOR_VARCAHR_RESULT);
}
} else if (ob_is_text_tc(type.get_type())) { } else if (ob_is_text_tc(type.get_type())) {
const int32_t mbmaxlen = 4; const int32_t mbmaxlen = 4;
const int32_t default_text_length = const int32_t default_text_length =