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

[BUGFIX] fix expr to str support return text

Browse Source
This commit is contained in:
obdev
2023-03-02 19:18:38 +00:00
committed by ob-robot
parent 42778d1356
commit 87223f9a44
4 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/resolver/expr/ob_raw_expr_util.cpp
View File

@ -3803,7 +3803,8 @@ int ObRawExprUtils::create_type_to_str_expr(ObRawExprFactory &expr_factory,
ObRawExpr *src_expr,
ObSysFunRawExpr *&out_expr,
ObSQLSessionInfo *session_info,
bool is_type_to_str)
bool is_type_to_str,
ObObjType dst_type)
{
int ret = OB_SUCCESS;
ObExprOperator *op = NULL;
@ -3839,6 +3840,9 @@ int ObRawExprUtils::create_type_to_str_expr(ObRawExprFactory &expr_factory,
LOG_ERROR("allocate expr operator failed", K(ret));
} else {
out_expr->set_func_name(ObString::make_string(func_name));
if (is_lob_storage(dst_type)) {
out_expr->set_extra(1);
}
}
ObConstRawExpr *col_accuracy_expr = NULL;

3
src/sql/resolver/expr/ob_raw_expr_util.h
View File

@ -474,7 +474,8 @@ public:
ObRawExpr *src_expr,
ObSysFunRawExpr *&out_expr,
ObSQLSessionInfo *session_info,
bool is_type_to_str);
bool is_type_to_str,
ObObjType dst_type = ObMaxType);
static int get_exec_param_expr(ObRawExprFactory &expr_factory,
ObQueryRefRawExpr *query_ref,

16
src/sql/resolver/expr/ob_raw_expr_wrap_enum_set.cpp
View File

@ -433,10 +433,12 @@ int ObRawExprWrapEnumSet::check_and_wrap_left(ObRawExpr &expr, int64_t idx,
bool need_numberic = false;
bool need_varchar = false;
const bool is_same_type_need = false;
ObObjType dest_type = ObMaxType;
for (int64_t i = 0; OB_SUCC(ret) && i < target_num && !(need_numberic && need_varchar); ++i) {
bool need_wrap = false;
dest_type = cmp_types.at(row_dimension * i + idx).get_type();
if (OB_FAIL(ObRawExprUtils::need_wrap_to_string(expr_type,
cmp_types.at(row_dimension * i + idx).get_type(),
dest_type,
is_same_type_need, need_wrap))) {
LOG_WARN("failed to check whether need wrap", K(i), K(expr), K(ret));
} else if (need_wrap) {
@ -449,7 +451,7 @@ int ObRawExprWrapEnumSet::check_and_wrap_left(ObRawExpr &expr, int64_t idx,
if (OB_SUCC(ret) && need_varchar) {
const bool is_type_to_str = !need_numberic;
if (OB_FAIL(ObRawExprUtils::create_type_to_str_expr(expr_factory_, &expr,
wrapped_expr, my_session_, is_type_to_str))) {
wrapped_expr, my_session_, is_type_to_str, dest_type))) {
LOG_WARN("failed to create_type_to_string_expr",K(expr), K(ret));
}
}
@ -633,7 +635,7 @@ int ObRawExprWrapEnumSet::wrap_type_to_str_if_necessary(ObRawExpr *expr,
is_same_need, need_wrap))) {
LOG_WARN("failed to check_need_wrap_to_string", K(ret));
} else if (need_wrap && OB_FAIL(ObRawExprUtils::create_type_to_str_expr(expr_factory_, expr,
wrapped_expr, my_session_, is_type_to_str))) {
wrapped_expr, my_session_, is_type_to_str, dest_type))) {
LOG_WARN("failed to create_type_to_string_expr", KPC(expr), K(is_type_to_str), K(ret));
} else {
LOG_DEBUG("finish wrap_type_to_str_if_necessary", K(ret), K(need_wrap), K(dest_type), KPC(expr),
@ -663,8 +665,9 @@ int ObRawExprWrapEnumSet::visit(ObCaseOpRawExpr &expr)
bool need_numberic = false;
bool need_varchar = false;
ObObjType arg_type = arg_param_expr->get_data_type();
ObObjType calc_type = ObMaxType;
for (int64_t i = 0; OB_SUCC(ret) && i < expr.get_when_expr_size(); ++i) {
ObObjType calc_type = expr.get_input_types().at(i + 1).get_calc_type();
calc_type = expr.get_input_types().at(i + 1).get_calc_type();
wrapped_expr = NULL;
ObRawExpr *when_expr = expr.get_when_param_expr(i);
bool need_wrap = false;
@ -685,7 +688,7 @@ int ObRawExprWrapEnumSet::visit(ObCaseOpRawExpr &expr)
const bool is_type_to_str = !need_numberic;
wrapped_expr = NULL;
if (OB_FAIL(ObRawExprUtils::create_type_to_str_expr(expr_factory_, arg_param_expr,
wrapped_expr, my_session_, is_type_to_str))) {
wrapped_expr, my_session_, is_type_to_str, calc_type))) {
LOG_WARN("failed to create_type_to_string_expr", K(ret));
} else if (OB_ISNULL(wrapped_expr)) {
ret = OB_ERR_UNEXPECTED;
@ -870,7 +873,8 @@ int ObRawExprWrapEnumSet::wrap_nullif_expr(ObSysFunRawExpr &expr)
left_param,
wrapped_expr,
my_session_,
is_type_to_str))) {
is_type_to_str,
calc_type))) {
LOG_WARN("failed to create_type_to_string_expr", K(ret));
} else if ((NULL != wrapped_expr) && OB_FAIL(expr.replace_param_expr(0, wrapped_expr))) {
LOG_WARN("failed to replace left param expr", K(ret));