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

fix nullif deduce type

Browse Source
This commit is contained in:
sdc
2023-05-10 18:10:01 +00:00
committed by ob-robot
parent e9d12d0919
commit 93283e3726
2 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/sql/engine/expr/ob_expr_nullif.cpp
View File

@ -79,23 +79,8 @@ int ObExprNullif::se_deduce_type(ObExprResType &type,
if (ob_is_real_type(type.get_type()) && SCALE_UNKNOWN_YET != type1.get_scale()) { if (ob_is_real_type(type.get_type()) && SCALE_UNKNOWN_YET != type1.get_scale()) {
type.set_precision(static_cast<ObPrecision>(ObMySQLUtil::float_length(type1.get_scale()))); type.set_precision(static_cast<ObPrecision>(ObMySQLUtil::float_length(type1.get_scale())));
} else if (ob_is_string_type(type.get_type()) || ob_is_enumset_tc(type.get_type())) { } else if (ob_is_string_type(type.get_type()) || ob_is_enumset_tc(type.get_type())) {
ObCollationLevel res_cs_level = CS_LEVEL_INVALID; type.set_collation_level(type1.get_collation_level());
ObCollationType res_cs_type = CS_TYPE_INVALID; type.set_collation_type(type1.get_collation_type());
OZ(ObCharset::aggregate_collation(type1.get_collation_level(), type1.get_collation_type(),
type2.get_collation_level(), type2.get_collation_type(),
res_cs_level, res_cs_type));
if (OB_SUCC(ret)) {
type.set_collation_level(res_cs_level);
type.set_collation_type(res_cs_type);
//deduce length
if (type.get_collation_type() == CS_TYPE_BINARY) {
ObLength len_in_byte = -1;
OZ(type1.get_length_for_meta_in_bytes(len_in_byte));
OX(type.set_length(len_in_byte));
} else {
type.set_length(type1.get_length());
}
}
} }
if (ob_is_enumset_tc(type.get_type()) || ob_is_enumset_inner_tc(type.get_type())) { if (ob_is_enumset_tc(type.get_type()) || ob_is_enumset_inner_tc(type.get_type())) {
type.set_varchar(); type.set_varchar();
@ -117,8 +102,6 @@ int ObExprNullif::se_deduce_type(ObExprResType &type,
type1.set_calc_type(calc_type); type1.set_calc_type(calc_type);
type1.set_calc_collation_type(cmp_type.get_calc_collation_type()); type1.set_calc_collation_type(cmp_type.get_calc_collation_type());
} }
//if (ob_is_enumset_tc(type2.get_type())) {
//}
} }
// set calc type for type2 no matter whether calc_type is varchar or not, and no matther which param is enum. // set calc type for type2 no matter whether calc_type is varchar or not, and no matther which param is enum.
type2.set_calc_type(calc_type); type2.set_calc_type(calc_type);
@ -128,14 +111,6 @@ int ObExprNullif::se_deduce_type(ObExprResType &type,
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
type.set_calc_meta(cmp_type.get_calc_meta()); type.set_calc_meta(cmp_type.get_calc_meta());
type.set_calc_accuracy(cmp_type.get_calc_accuracy()); type.set_calc_accuracy(cmp_type.get_calc_accuracy());
if (ob_is_string_type(type1.get_type())
&& ob_is_string_type(type2.get_type())
&& ob_obj_type_class(type1.get_type()) != ob_obj_type_class(type2.get_type())
&& ob_enable_lob_locator_v2()) {
// strings and texts cannot compare directly in 4.1
type1.set_calc_type(type.get_calc_meta().get_type());
type2.set_calc_type(type.get_calc_meta().get_type());
}
} }
} }
return ret; return ret;

4
tools/deploy/mysql_test/test_suite/static_engine/r/mysql/expr_nullif_ifnull.result
View File

@ -7475,7 +7475,7 @@ select collation(nullif('a', binary'b'));
+-----------------------------------+ +-----------------------------------+
| collation(nullif('a', binary'b')) | | collation(nullif('a', binary'b')) |
+-----------------------------------+ +-----------------------------------+
| binary | | utf8mb4_general_ci |
+-----------------------------------+ +-----------------------------------+
select NULLIF(14152561829011783680, 1); select NULLIF(14152561829011783680, 1);
+---------------------------------+ +---------------------------------+
@ -7661,7 +7661,7 @@ select collation(nullif('a', binary 'b'));
+------------------------------------+ +------------------------------------+
| collation(nullif('a', binary 'b')) | | collation(nullif('a', binary 'b')) |
+------------------------------------+ +------------------------------------+
| binary | | utf8mb4_general_ci |
+------------------------------------+ +------------------------------------+
## test nullif with enumset parameter. ## test nullif with enumset parameter.