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

fix resolver bug of outer join symbol

Browse Source
This commit is contained in:
akaError
2023-12-04 13:42:34 +00:00
committed by ob-robot
parent f7f42ceda9
commit d787f731e2
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sql/resolver/dml/ob_dml_resolver.cpp
View File

@ -1544,7 +1544,8 @@ int ObDMLResolver::resolve_sql_expr(const ParseNode &node, ObRawExpr *&expr,
current_scope_ != T_INSERT_SCOPE &&
!is_hierarchical_query &&
!is_multi_stmt &&
!params_.is_resolve_table_function_expr_) {
!params_.is_resolve_table_function_expr_ &&
!expr->has_flag(CNT_OUTER_JOIN_SYMBOL)) {
bool is_new = false;
if (OB_FAIL(expr_resv_ctx_.get_shared_instance(expr, expr, is_new))) {
LOG_WARN("failed to get shared instance", K(ret));
@ -11817,6 +11818,7 @@ int ObDMLResolver::deliver_outer_join_conditions(ObIArray<ObRawExpr*> &exprs,
ObIArray<JoinedTable*> &joined_tables)
{
int ret = OB_SUCCESS;
ObSEArray<ObRawExpr*, 4> where_conditions;
for (int64_t i = exprs.count() - 1; OB_SUCC(ret) && i >=0; i--) {
ObArray<uint64_t> left_tables;
ObArray<uint64_t> right_tables;
@ -11847,11 +11849,28 @@ int ObDMLResolver::deliver_outer_join_conditions(ObIArray<ObRawExpr*> &exprs,
OZ(deliver_expr_to_outer_join_table(expr, table_ids, joined_tables.at(j), is_delivered));
}
OZ(remove_outer_join_symbol(expr));
OZ((expr->extract_info)());
if (OB_SUCC(ret) && is_delivered) {
OZ((exprs.remove)(i));
//do nothing
} else if (OB_FAIL(where_conditions.push_back(exprs.at(i)))) {
LOG_WARN("fail to push back exprs", K(ret));
}
} else if (OB_FAIL(where_conditions.push_back(exprs.at(i)))) {
LOG_WARN("fail to push back exprs", K(ret));
}
}
for (int64_t i = 0; OB_SUCC(ret) && i < exprs.count(); i++) {
if (OB_ISNULL(exprs.at(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error", K(i), K(ret));
} else if (OB_FAIL(remove_outer_join_symbol(exprs.at(i)))) {
LOG_WARN("fail to remove outer join symbol", K(i), K(ret));
} else if (OB_FAIL(exprs.at(i)->extract_info())) {
LOG_WARN("fail to extract expr info", K(i), K(ret));
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(exprs.assign(where_conditions))) {
LOG_WARN("fail to assign exprs", K(ret));
}
}
return ret;