CP 3.1 commit to open source

This commit is contained in:
leslieyuchen
2021-07-27 21:21:14 +08:00
committed by wangzelin.wzl
parent 2b51e4f001
commit 09edba0ff6
20 changed files with 117 additions and 107 deletions

View File

@ -47,7 +47,7 @@ int ObUpdateStmt::deep_copy_stmt_struct(
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(refill_index_assignment_info())) {
if (OB_FAIL(refill_index_assignment_info(expr_factory, other.use_static_typing_engine_))) {
LOG_WARN("fail refill index assignment info", K(ret));
}
}
@ -342,7 +342,7 @@ const ObTablesAssignments* ObUpdateStmt::get_slice_from_all_table_assignments(
return tables_assignments;
}
int ObUpdateStmt::refill_index_assignment_info()
int ObUpdateStmt::refill_index_assignment_info(ObRawExprFactory& expr_factory, bool use_static_typing_engine)
{
int ret = OB_SUCCESS;
const ObTablesAssignments& table_assign = get_tables_assignments();
@ -353,11 +353,12 @@ int ObUpdateStmt::refill_index_assignment_info()
ObIArray<IndexDMLInfo>& index_infos = all_table_columns.at(i).index_dml_infos_;
for (int64_t j = 0; OB_SUCC(ret) && j < index_infos.count(); ++j) {
IndexDMLInfo& index_info = index_infos.at(j);
if (OB_FAIL(index_info.init_assignment_info(assignments))) {
if (OB_FAIL(index_info.init_assignment_info(assignments, expr_factory, use_static_typing_engine))) {
LOG_WARN("init index assignment info failed", K(i), K(ret));
}
}
}
use_static_typing_engine_ = use_static_typing_engine;
return ret;
}