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

fix mysqltest

Browse Source
This commit is contained in:
akaError 2024-03-14 11:45:04 +00:00 committed by ob-robot
parent ab5f1eef87
commit e6ac671233
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/optimizer/ob_optimizer_util.cpp
View File

@ -4590,14 +4590,9 @@ int ObOptimizerUtil::check_push_down_expr(const ObRelIds &table_ids,
{
int ret = OB_SUCCESS;
all_contain = true;
bool contain_op_row = false;
if (OB_FAIL(ObRawExprUtils::check_contain_op_row_expr(&or_qual, contain_op_row))) {
LOG_WARN("fail to check contain op row", K(ret));
} else if (contain_op_row) {
all_contain = false;
}
for (int64_t i = 0; OB_SUCC(ret) && all_contain && i < or_qual.get_param_count(); ++i) {
ObRawExpr *cur_expr = or_qual.get_param_expr(i);
bool contain_op_row = false;
if (OB_ISNULL(cur_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr in or expr is null", K(ret));
@ -4606,11 +4601,16 @@ int ObOptimizerUtil::check_push_down_expr(const ObRelIds &table_ids,
ObOpRawExpr *and_expr = static_cast<ObOpRawExpr *>(cur_expr);
for (int64_t j = 0; OB_SUCC(ret) && j < and_expr->get_param_count(); ++j) {
ObRawExpr *cur_and_expr = and_expr->get_param_expr(j);
contain_op_row = false;
if (OB_ISNULL(cur_and_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr in and expr is null", K(ret));
} else if (cur_and_expr->has_flag(CNT_SUB_QUERY)) {
//do nothing
} else if (OB_FAIL(ObRawExprUtils::check_contain_op_row_expr(cur_and_expr, contain_op_row))) {
LOG_WARN("fail to check contain op row", K(ret));
} else if (contain_op_row) {
// do nothing
} else if (!table_ids.is_superset(cur_and_expr->get_relation_ids())) {
//do nothing
} else if (cur_and_expr->get_relation_ids().is_empty() &&
@ -4626,6 +4626,10 @@ int ObOptimizerUtil::check_push_down_expr(const ObRelIds &table_ids,
}
} else if (cur_expr->has_flag(CNT_SUB_QUERY)) {
all_contain = false;
} else if (OB_FAIL(ObRawExprUtils::check_contain_op_row_expr(cur_expr, contain_op_row))) {
LOG_WARN("fail to check contain op row", K(ret));
} else if (contain_op_row) {
all_contain = false;
} else if (!table_ids.is_superset(cur_expr->get_relation_ids())) {
all_contain = false;
} else if (cur_expr->get_relation_ids().is_empty() &&

11
src/sql/rewrite/ob_transform_predicate_move_around.cpp
View File

@ -2457,12 +2457,6 @@ int ObTransformPredicateMoveAround::check_having_expr(ObSelectStmt &stmt,
ObSEArray<ObRawExpr *, 4> generalized_columns;
ObSEArray<ObRawExpr *, 4> param_preds;
all_contain = true;
bool contain_op_row = false;
if (OB_FAIL(ObRawExprUtils::check_contain_op_row_expr(&or_qual, contain_op_row))) {
LOG_WARN("fail to check contain op row", K(ret));
} else if (contain_op_row) {
all_contain = false;
}
for (int64_t i = 0; OB_SUCC(ret) && all_contain && i < or_qual.get_param_count(); ++i) {
ObRawExpr *cur_expr = or_qual.get_param_expr(i);
generalized_columns.reuse();
@ -2484,11 +2478,16 @@ int ObTransformPredicateMoveAround::check_having_expr(ObSelectStmt &stmt,
for (int64_t j = 0; OB_SUCC(ret) && j < param_preds.count(); ++j) {
ObRawExpr *cur_and_expr = param_preds.at(j);
generalized_columns.reuse();
bool contain_op_row = false;
if (OB_ISNULL(cur_and_expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr in and expr is null", K(ret));
} else if (cur_and_expr->has_flag(CNT_SUB_QUERY)) {
// do nothing
} else if (OB_FAIL(ObRawExprUtils::check_contain_op_row_expr(cur_and_expr, contain_op_row))) {
LOG_WARN("fail to check contain op row", K(ret));
} else if (contain_op_row) {
// do nothing
} else if (OB_FAIL(extract_generalized_column(cur_and_expr, generalized_columns))) {
LOG_WARN("failed to extract generalized columns", K(ret));
} else if (!ObOptimizerUtil::subset_exprs(