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

fix some replace expr bugs in optimizer

Browse Source
This commit is contained in:
yinyj17
2023-06-14 07:12:26 +00:00
committed by ob-robot
parent 56f33a54f2
commit 703ed5c14e
48 changed files with 268 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/sql/optimizer/ob_log_for_update.cpp
View File

@ -308,7 +308,7 @@ bool ObLogForUpdate::is_multi_table_skip_locked()
return is_multi_table_skip_locked;
}
int ObLogForUpdate::inner_replace_op_exprs(const common::ObIArray<std::pair<ObRawExpr *, ObRawExpr *> > &to_replace_exprs)
int ObLogForUpdate::inner_replace_op_exprs(ObRawExprReplacer &replacer)
{
int ret = OB_SUCCESS;
for (int64_t i = 0; OB_SUCC(ret) && i < index_dml_info_.count(); ++i) {
@ -316,31 +316,27 @@ int ObLogForUpdate::inner_replace_op_exprs(const common::ObIArray<std::pair<ObRa
if (OB_ISNULL(dml_info)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("dml info is null", K(ret));
} else if (OB_FAIL(replace_exprs_action(to_replace_exprs,
dml_info->ck_cst_exprs_))) {
} else if (OB_FAIL(replace_exprs_action(replacer, dml_info->ck_cst_exprs_))) {
LOG_WARN("failed to replace exprs", K(ret));
} else if (NULL != dml_info->new_part_id_expr_ &&
OB_FAIL(replace_expr_action(to_replace_exprs, dml_info->new_part_id_expr_))) {
OB_FAIL(replace_expr_action(replacer, dml_info->new_part_id_expr_))) {
LOG_WARN("failed to replace new parititon id expr", K(ret));
} else if (NULL != dml_info->old_part_id_expr_ &&
OB_FAIL(replace_expr_action(to_replace_exprs, dml_info->old_part_id_expr_))) {
OB_FAIL(replace_expr_action(replacer, dml_info->old_part_id_expr_))) {
LOG_WARN("failed to replace old parititon id expr", K(ret));
} else if (NULL != dml_info->old_rowid_expr_ &&
OB_FAIL(replace_expr_action(to_replace_exprs, dml_info->old_rowid_expr_))) {
OB_FAIL(replace_expr_action(replacer, dml_info->old_rowid_expr_))) {
LOG_WARN("failed to replace old rowid expr", K(ret));
} else if (NULL != dml_info->new_rowid_expr_ &&
OB_FAIL(replace_expr_action(to_replace_exprs, dml_info->new_rowid_expr_))) {
OB_FAIL(replace_expr_action(replacer, dml_info->new_rowid_expr_))) {
LOG_WARN("failed to replace new rowid expr", K(ret));
} else if (OB_FAIL(replace_exprs_action(to_replace_exprs,
dml_info->column_convert_exprs_))) {
} else if (OB_FAIL(replace_exprs_action(replacer, dml_info->column_convert_exprs_))) {
LOG_WARN("failed to replace exprs", K(ret));
} else if (OB_FAIL(replace_exprs_action(to_replace_exprs,
dml_info->column_old_values_exprs_))) {
} else if (OB_FAIL(replace_exprs_action(replacer, dml_info->column_old_values_exprs_))) {
LOG_WARN("failed to replace column old values exprs ", K(ret));
}
for (int64_t j = 0; OB_SUCC(ret) && j < dml_info->assignments_.count(); ++j) {
if (OB_FAIL(replace_expr_action(to_replace_exprs,
dml_info->assignments_.at(j).expr_))) {
if (OB_FAIL(replace_expr_action(replacer, dml_info->assignments_.at(j).expr_))) {
LOG_WARN("failed to replace expr", K(ret));
}
}