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

[bp2] batch patch code from 31x to opensource

Browse Source
This commit is contained in:
raywill
2021-07-29 16:30:15 +08:00
committed by wangzelin.wzl
parent 1f8ee09135
commit 79131c0cda
40 changed files with 549 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sql/resolver/dml/ob_update_stmt.cpp
View File

@ -47,7 +47,7 @@ int ObUpdateStmt::deep_copy_stmt_struct(
}
}
if (OB_SUCC(ret)) {
if (OB_FAIL(refill_index_assignment_info(expr_factory, other.use_static_typing_engine_))) {
if (OB_FAIL(refill_global_index_dml_info(expr_factory, other.use_static_typing_engine_))) {
LOG_WARN("fail refill index assignment info", K(ret));
}
}
@ -315,6 +315,7 @@ const ObTablesAssignments* ObUpdateStmt::get_slice_from_all_table_assignments(
LOG_WARN("fail copy array", K(ret));
} else {
bool is_update_part_key = false;
bool is_update_unique_key = false;
if (dml_index_info.all_part_num_ > 1) { // Only partition tables have part_key
for (int i = 0; i < dml_index_info.assignments_.count(); ++i) {
uint64_t col_id = dml_index_info.assignments_.at(i).column_expr_->get_column_id();
@ -326,7 +327,22 @@ const ObTablesAssignments* ObUpdateStmt::get_slice_from_all_table_assignments(
}
}
}
if (share::schema::ObSimpleTableSchemaV2::is_global_unique_index_table(dml_index_info.index_type_)) {
for (int i = 0; i < dml_index_info.assignments_.count(); ++i) {
uint64_t col_id = dml_index_info.assignments_.at(i).column_expr_->get_column_id();
for (int j = 0; j < dml_index_info.primary_key_ids_.count(); ++j) {
if (dml_index_info.primary_key_ids_.at(j) == col_id) {
is_update_unique_key = true;
break;
}
}
}
}
// [pdml]: 对于每个索引表单独计算，不应该继承主表的属性
table_assignments->is_update_part_key_ = is_update_part_key;
table_assignments->is_update_unique_key_ = is_update_unique_key;
table_assignments->table_id_ = dml_index_info.table_id_;
}
@ -342,7 +358,7 @@ const ObTablesAssignments* ObUpdateStmt::get_slice_from_all_table_assignments(
return tables_assignments;
}
int ObUpdateStmt::refill_index_assignment_info(ObRawExprFactory& expr_factory, bool use_static_typing_engine)
int ObUpdateStmt::refill_global_index_dml_info(ObRawExprFactory& expr_factory, bool use_static_typing_engine)
{
int ret = OB_SUCCESS;
const ObTablesAssignments& table_assign = get_tables_assignments();
@ -358,7 +374,6 @@ int ObUpdateStmt::refill_index_assignment_info(ObRawExprFactory& expr_factory, b
}
}
}
use_static_typing_engine_ = use_static_typing_engine;
return ret;
}