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

[CP] fix join elimination bug

Browse Source
This commit is contained in:
obdev
2022-05-05 14:21:27 +08:00
committed by wangzelin.wzl
parent 7d150eca15
commit 336c46df13
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/rewrite/ob_transform_join_elimination.cpp
View File

@ -2074,11 +2074,10 @@ int ObTransformJoinElimination::trans_column_expr(ObDMLStmt* stmt, ObRawExpr* ex
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
new_expr = NULL; new_expr = NULL;
if (OB_ISNULL(stmt) || OB_ISNULL(expr) || OB_ISNULL(ctx_)) {
LOG_WARN("param has null", K(ret));
} else {
bool is_nullable = false; bool is_nullable = false;
if (OB_FAIL(ObTransformUtils::check_expr_nullable(stmt, expr, is_nullable))) { if (OB_ISNULL(stmt) || OB_ISNULL(expr) || OB_ISNULL(ctx_)) {
LOG_WARN("param has null", K(ret), K(stmt), K(expr), K(ctx_));
} else if (OB_FAIL(ObTransformUtils::check_expr_nullable(stmt, expr, is_nullable, ObTransformUtils::NULLABLE_SCOPE::NS_FROM))) {
LOG_WARN("failed to check whether expr is nullable", K(ret)); LOG_WARN("failed to check whether expr is nullable", K(ret));
} else if (!is_nullable) { } else if (!is_nullable) {
if (OB_FAIL(ObRawExprUtils::build_const_bool_expr(ctx_->expr_factory_, new_expr, true))) { if (OB_FAIL(ObRawExprUtils::build_const_bool_expr(ctx_->expr_factory_, new_expr, true))) {
@ -2091,7 +2090,6 @@ int ObTransformJoinElimination::trans_column_expr(ObDMLStmt* stmt, ObRawExpr* ex
} else { /*do nothing*/ } else { /*do nothing*/
} }
} }
}
return ret; return ret;
} }

6
src/sql/rewrite/ob_transform_utils.cpp
View File

@ -1743,7 +1743,7 @@ int ObTransformUtils::find_not_null_expr(ObDMLStmt& stmt, ObRawExpr*& not_null_e
// 1. check is there null rejecting condition // 1. check is there null rejecting condition
// 2. check is nullable column, and is not the right table of outer join // 2. check is nullable column, and is not the right table of outer join
int ObTransformUtils::check_expr_nullable(ObDMLStmt* stmt, ObRawExpr* expr, bool& is_nullable) int ObTransformUtils::check_expr_nullable(ObDMLStmt* stmt, ObRawExpr* expr, bool& is_nullable, int nullable_scope /* = ObTransformUtils::NULLABLE_SCOPE::NS_WHERE */)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
is_nullable = true; is_nullable = true;
@ -1757,13 +1757,15 @@ int ObTransformUtils::check_expr_nullable(ObDMLStmt* stmt, ObRawExpr* expr, bool
LOG_WARN("failed to check is not null column", K(ret)); LOG_WARN("failed to check is not null column", K(ret));
} else if (not_null_col) { } else if (not_null_col) {
is_nullable = false; is_nullable = false;
} else if (OB_FAIL(stmt->get_equal_set_conditions(valid_conds, true, SCOPE_WHERE))) { } else if (nullable_scope >= ObTransformUtils::NULLABLE_SCOPE::NS_WHERE) {
if (OB_FAIL(stmt->get_equal_set_conditions(valid_conds, true, SCOPE_WHERE))) {
LOG_WARN("failed to get equal set conditions", K(ret)); LOG_WARN("failed to get equal set conditions", K(ret));
} else if (OB_FAIL(has_null_reject_condition(valid_conds, expr, has_null_reject))) { } else if (OB_FAIL(has_null_reject_condition(valid_conds, expr, has_null_reject))) {
LOG_WARN("failed to check has null reject condition", K(ret)); LOG_WARN("failed to check has null reject condition", K(ret));
} else if (has_null_reject) { } else if (has_null_reject) {
is_nullable = false; is_nullable = false;
} }
}
return ret; return ret;
} }

2
src/sql/rewrite/ob_transform_utils.h
View File

@ -242,7 +242,7 @@ public:
static int find_not_null_expr(ObDMLStmt& stmt, ObRawExpr*& not_null_expr, bool& is_valid); static int find_not_null_expr(ObDMLStmt& stmt, ObRawExpr*& not_null_expr, bool& is_valid);
static int check_expr_nullable(ObDMLStmt* stmt, ObRawExpr* expr, bool& is_nullable); static int check_expr_nullable(ObDMLStmt* stmt, ObRawExpr* expr, bool& is_nullable, int nullable_scope = ObTransformUtils::NULLABLE_SCOPE::NS_WHERE);
static int check_is_not_null_column(const ObDMLStmt* stmt, const ObRawExpr* expr, bool& col_not_null); static int check_is_not_null_column(const ObDMLStmt* stmt, const ObRawExpr* expr, bool& col_not_null);