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

fix transform expr bug, convert single value row c1 in (1) to c1 = 1

Browse Source
This commit is contained in:
zs0
2021-09-24 13:18:22 +08:00
committed by wangzelin.wzl
parent ae8c941ed4
commit 0a794fcaad
2 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/sql/rewrite/ob_transform_pre_process.cpp
View File

@ -3133,49 +3133,27 @@ int ObTransformPreProcess::transform_in_or_notin_expr_without_row(ObRawExprFacto
} }
} else { } else {
LOG_DEBUG("distinct types", K(distinct_types)); LOG_DEBUG("distinct types", K(distinct_types));
ObSEArray<ObRawExpr*, 4> transed_in_exprs; ObSEArray<ObRawExpr *, 4> transed_in_exprs;
ObOpRawExpr* tmp_in_expr = NULL; ObSEArray<ObRawExpr *, 4> same_type_exprs;
ObOpRawExpr* tmp_row_expr = NULL;
ObRawExpr* tmp_left_expr = NULL;
ObItemType op_type = is_in_expr ? T_OP_IN : T_OP_NOT_IN;
for (int i = 0; OB_SUCC(ret) && i < distinct_types.count(); i++) { for (int i = 0; OB_SUCC(ret) && i < distinct_types.count(); i++) {
same_type_exprs.reuse();
DistinctObjMeta obj_meta = distinct_types.at(i); DistinctObjMeta obj_meta = distinct_types.at(i);
if (OB_FAIL(expr_factory.create_raw_expr(op_type, tmp_in_expr)) || for (int j = 0; OB_SUCC(ret) && j < right_expr->get_param_count(); j++) {
OB_FAIL(expr_factory.create_raw_expr(T_OP_ROW, tmp_row_expr)) || ObObjType obj_type = right_expr->get_param_expr(j)->get_result_type().get_type();
OB_FAIL(ObRawExprUtils::copy_expr(expr_factory, left_expr, tmp_left_expr, COPY_REF_DEFAULT))) { ObCollationType coll_type = right_expr->get_param_expr(j)->get_result_type().get_collation_type();
LOG_WARN("failed to create or create raw expr", K(ret)); ObCollationLevel coll_level = right_expr->get_param_expr(j)->get_result_type().get_collation_level();
} else if (OB_ISNULL(tmp_in_expr) || OB_ISNULL(tmp_row_expr) || OB_ISNULL(tmp_left_expr)) { DistinctObjMeta tmp_meta(obj_type, coll_type, coll_level);
ret = OB_INVALID_ARGUMENT; if (obj_meta == tmp_meta && OB_FAIL(same_type_exprs.push_back(right_expr->get_param_expr(j)))) {
LOG_WARN("invalid null expr", K(ret), K(tmp_in_expr), K(tmp_row_expr), K(tmp_left_expr)); LOG_WARN("failed to add param expr", K(ret));
} else { } else { /* do nothing */
for (int j = 0; OB_SUCC(ret) && j < right_expr->get_param_count(); j++) {
ObObjType obj_type = right_expr->get_param_expr(j)->get_result_type().get_type();
ObCollationType coll_type = right_expr->get_param_expr(j)->get_result_type().get_collation_type();
ObCollationLevel coll_level = right_expr->get_param_expr(j)->get_result_type().get_collation_level();
DistinctObjMeta tmp_meta(obj_type, coll_type, coll_level);
if (obj_meta == tmp_meta && OB_FAIL(tmp_row_expr->add_param_expr(right_expr->get_param_expr(j)))) {
LOG_WARN("failed to add param expr", K(ret));
} else { /* do nothing */
}
} // for end
if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(tmp_in_expr->add_param_expr(tmp_left_expr)) ||
OB_FAIL(tmp_in_expr->add_param_expr(tmp_row_expr))) {
LOG_WARN("failed to add param exprs", K(ret));
} else if (OB_FAIL(transed_in_exprs.push_back(tmp_in_expr))) {
LOG_WARN("failed to push back element", K(ret));
} else {
tmp_in_expr->set_deduce_type_adding_implicit_cast(true);
LOG_DEBUG("partial in expr", K(*tmp_in_expr), K(*tmp_row_expr), K(*left_expr));
tmp_left_expr = NULL;
tmp_row_expr = NULL;
tmp_in_expr = NULL;
} }
} // for end
if (OB_SUCC(ret) &&
OB_FAIL(create_partial_expr(expr_factory, left_expr, same_type_exprs, is_in_expr, transed_in_exprs))) {
LOG_WARN("failed to create partial expr", K(ret));
} }
} // for end } // for end
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(get_final_transed_or_and_expr(expr_factory, session, is_in_expr, transed_in_exprs, in_expr))) { } else if (OB_FAIL(get_final_transed_or_and_expr(expr_factory, session, is_in_expr, transed_in_exprs, in_expr))) {
LOG_WARN("failed to get final transed or expr", K(ret)); LOG_WARN("failed to get final transed or expr", K(ret));
} else { } else {
@ -3229,10 +3207,6 @@ int ObTransformPreProcess::transform_in_or_notin_expr_with_row(ObRawExprFactory&
} }
} }
} // for end } // for end
ObSEArray<ObRawExpr*, 4> transed_in_exprs;
ObOpRawExpr* tmp_in_expr = NULL;
ObOpRawExpr* tmp_row_expr = NULL;
ObRawExpr* tmp_left_expr = NULL;
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
// do nothing // do nothing
} else if (1 == distinct_row_types.count()) { } else if (1 == distinct_row_types.count()) {
@ -3245,38 +3219,22 @@ int ObTransformPreProcess::transform_in_or_notin_expr_with_row(ObRawExprFactory&
op_raw_expr->set_deduce_type_adding_implicit_cast(true); op_raw_expr->set_deduce_type_adding_implicit_cast(true);
} }
} else { } else {
ObItemType op_type = is_in_expr ? T_OP_IN : T_OP_NOT_IN; ObSEArray<ObRawExpr *, 4> transed_in_exprs;
ObSEArray<ObRawExpr *, 4> same_type_exprs;
for (int i = 0; OB_SUCC(ret) && i < distinct_row_types.count(); i++) { for (int i = 0; OB_SUCC(ret) && i < distinct_row_types.count(); i++) {
if (OB_FAIL(expr_factory.create_raw_expr(op_type, tmp_in_expr)) || same_type_exprs.reuse();
OB_FAIL(expr_factory.create_raw_expr(T_OP_ROW, tmp_row_expr)) || for (int j = 0; OB_SUCC(ret) && j < all_row_types.count(); j++) {
OB_FAIL(ObRawExprUtils::copy_expr(expr_factory, left_expr, tmp_left_expr, COPY_REF_DEFAULT))) { if (is_same_row_type(distinct_row_types.at(i), all_row_types.at(j)) &&
LOG_WARN("failed to create or copy raw expr", K(ret)); OB_FAIL(same_type_exprs.push_back(right_expr->get_param_expr(j)))) {
} else if (OB_ISNULL(tmp_in_expr) || OB_ISNULL(tmp_row_expr) || OB_ISNULL(tmp_left_expr)) { LOG_WARN("failed to add param expr", K(ret));
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid null raw expr", K(ret), K(tmp_in_expr), K(tmp_left_expr), K(tmp_row_expr));
} else {
for (int j = 0; OB_SUCC(ret) && j < all_row_types.count(); j++) {
if (is_same_row_type(distinct_row_types.at(i), all_row_types.at(j)) &&
OB_FAIL(tmp_row_expr->add_param_expr(right_expr->get_param_expr(j)))) {
LOG_WARN("failed to add param expr", K(ret));
}
} // for end
if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(tmp_in_expr->add_param_expr(tmp_left_expr)) ||
OB_FAIL(tmp_in_expr->add_param_expr(tmp_row_expr))) {
LOG_WARN("failed to add param exprs", K(ret));
} else if (OB_FAIL(transed_in_exprs.push_back(tmp_in_expr))) {
LOG_WARN("failed to push back element", K(ret));
} else {
tmp_in_expr->set_deduce_type_adding_implicit_cast(true);
tmp_row_expr = NULL;
tmp_in_expr = NULL;
} }
} // for end
if (OB_SUCC(ret) &&
OB_FAIL(create_partial_expr(expr_factory, left_expr, same_type_exprs, is_in_expr, transed_in_exprs))) {
LOG_WARN("failed to create partial expr", K(ret));
} }
} // for end } // for end
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(get_final_transed_or_and_expr(expr_factory, session, is_in_expr, transed_in_exprs, in_expr))) { } else if (OB_FAIL(get_final_transed_or_and_expr(expr_factory, session, is_in_expr, transed_in_exprs, in_expr))) {
LOG_WARN("failed to get final transed in expr", K(ret)); LOG_WARN("failed to get final transed in expr", K(ret));
} else { } else {
@ -3286,6 +3244,52 @@ int ObTransformPreProcess::transform_in_or_notin_expr_with_row(ObRawExprFactory&
return ret; return ret;
} }
int ObTransformPreProcess::create_partial_expr(ObRawExprFactory &expr_factory, ObRawExpr *left_expr,
ObIArray<ObRawExpr *> &same_type_exprs, const bool is_in_expr, ObIArray<ObRawExpr *> &transed_in_exprs)
{
int ret = OB_SUCCESS;
ObOpRawExpr *tmp_expr = NULL;
ObOpRawExpr *tmp_row_expr = NULL;
ObRawExpr *tmp_left_expr = NULL;
ObRawExpr *tmp_right_expr = NULL;
if (OB_UNLIKELY(same_type_exprs.empty())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected empty same_type_exprs", K(ret));
} else if (OB_FAIL(ObRawExprUtils::copy_expr(expr_factory, left_expr, tmp_left_expr, COPY_REF_DEFAULT))) {
LOG_WARN("failed to copy raw expr", K(ret));
} else if (1 == same_type_exprs.count()) { // = / <>
if (OB_FAIL(expr_factory.create_raw_expr(is_in_expr ? T_OP_EQ : T_OP_NE, tmp_expr))) {
LOG_WARN("failed to create or create raw expr", K(ret));
} else {
tmp_right_expr = same_type_exprs.at(0);
}
} else if (OB_FAIL(expr_factory.create_raw_expr(is_in_expr ? T_OP_IN : T_OP_NOT_IN, tmp_expr)) // in / not in
|| OB_FAIL(expr_factory.create_raw_expr(T_OP_ROW, tmp_row_expr))) {
LOG_WARN("failed to create or create raw expr", K(ret));
} else if (OB_ISNULL(tmp_row_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected null expr", K(ret), K(tmp_row_expr));
} else if (OB_FAIL(append(tmp_row_expr->get_param_exprs(), same_type_exprs))) {
LOG_WARN("failed to append exprs", K(ret));
} else {
tmp_right_expr = tmp_row_expr;
}
if (OB_FAIL(ret)) {
} else if (OB_ISNULL(tmp_expr) || OB_ISNULL(tmp_left_expr) || OB_ISNULL(tmp_right_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected null expr", K(ret), K(tmp_expr), K(tmp_left_expr), K(tmp_right_expr));
} else if (OB_FAIL(tmp_expr->add_param_expr(tmp_left_expr)) || OB_FAIL(tmp_expr->add_param_expr(tmp_right_expr))) {
LOG_WARN("failed to add param exprs", K(ret));
} else if (OB_FAIL(transed_in_exprs.push_back(tmp_expr))) {
LOG_WARN("failed to push back element", K(ret));
} else {
tmp_expr->set_deduce_type_adding_implicit_cast(true);
LOG_DEBUG("partial in expr", K(*tmp_expr), K(*tmp_right_expr), K(*left_expr));
}
return ret;
}
int ObTransformPreProcess::transform_arg_case_recursively( int ObTransformPreProcess::transform_arg_case_recursively(
ObRawExprFactory& expr_factory, const ObSQLSessionInfo& session, ObRawExpr*& expr, bool& trans_happened) ObRawExprFactory& expr_factory, const ObSQLSessionInfo& session, ObRawExpr*& expr, bool& trans_happened)
{ {

3
src/sql/rewrite/ob_transform_pre_process.h
View File

@ -188,6 +188,9 @@ private:
static int transform_in_or_notin_expr_without_row(ObRawExprFactory& expr_factory, const ObSQLSessionInfo& session, static int transform_in_or_notin_expr_without_row(ObRawExprFactory& expr_factory, const ObSQLSessionInfo& session,
const bool is_in_expr, ObRawExpr*& in_epxr, bool& trans_happened); const bool is_in_expr, ObRawExpr*& in_epxr, bool& trans_happened);
static int create_partial_expr(ObRawExprFactory &expr_factory, ObRawExpr *left_expr,
ObIArray<ObRawExpr *> &same_type_exprs, const bool is_in_expr, ObIArray<ObRawExpr *> &transed_in_exprs);
/* /*
* following functions are used to transform arg_case_expr to case_expr * following functions are used to transform arg_case_expr to case_expr
*/ */