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

Fix IS_OR flag and mysqltest

Browse Source
This commit is contained in:
xianyu-w
2023-09-20 17:20:59 +00:00
committed by ob-robot
parent c5e8b95d76
commit 982796f754
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/resolver/expr/ob_raw_expr_info_extractor.cpp
View File

@ -288,10 +288,6 @@ int ObRawExprInfoExtractor::visit(ObOpRawExpr &expr)
if (OB_FAIL(expr.add_flag(IS_IN))) { if (OB_FAIL(expr.add_flag(IS_IN))) {
LOG_WARN("failed to add flag IS_IN", K(ret)); LOG_WARN("failed to add flag IS_IN", K(ret));
} }
} else if (expr.get_expr_type() == T_OP_OR) {
if (OB_FAIL(expr.add_flag(IS_OR))) {
LOG_WARN("failed to add flag IS_OR", K(ret));
}
} else if (expr.get_expr_type() == T_OP_ASSIGN) { } else if (expr.get_expr_type() == T_OP_ASSIGN) {
if (OB_FAIL(expr.add_flag(IS_ASSIGN_EXPR))) { if (OB_FAIL(expr.add_flag(IS_ASSIGN_EXPR))) {
LOG_WARN("failed to add flag IS_ASSIGN_EXPR", K(ret)); LOG_WARN("failed to add flag IS_ASSIGN_EXPR", K(ret));
@ -319,6 +315,11 @@ int ObRawExprInfoExtractor::visit(ObOpRawExpr &expr)
} }
} else {} } else {}
} }
if (OB_SUCC(ret) && expr.get_expr_type() == T_OP_OR) {
if (OB_FAIL(expr.add_flag(IS_OR))) {
LOG_WARN("failed to add flag IS_OR", K(ret));
}
}
if (OB_SUCC(ret) && OB_FAIL(visit_subquery_node(expr))) { if (OB_SUCC(ret) && OB_FAIL(visit_subquery_node(expr))) {
LOG_WARN("visit subquery node failed", K(ret)); LOG_WARN("visit subquery node failed", K(ret));
} }

4
unittest/sql/resolver/expr/test_raw_expr_canonicalizer.result
View File

@ -1416,8 +1416,10 @@ not a between 1 and 100
} }
}, },
"expr_info": [ "expr_info": [
"IS_OR",
"IS_CONST_EXPR", "IS_CONST_EXPR",
"CNT_CONST" "CNT_CONST",
"CNT_OR"
], ],
"rel_id": [ "rel_id": [
], ],