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

4
src/sql/resolver/dml/ob_insert_resolver.cpp
View File

@ -181,8 +181,7 @@ int ObInsertResolver::resolve(const ParseNode& parse_tree)
}
}
if (OB_SUCC(ret) && insert_stmt->value_from_select() && session_info_->use_static_typing_engine() &&
!insert_stmt->get_insert_up()) {
if (OB_SUCC(ret) && insert_stmt->value_from_select() && !insert_stmt->get_insert_up()) {
if (OB_FAIL(fill_index_dml_info_column_conv_exprs())) {
LOG_WARN("fail to fill index dml info column conv exprs", K(ret));
}
@ -345,6 +344,7 @@ int ObInsertResolver::resolve_multi_table_dml_info(uint64_t table_offset /*defau
index_dml_info.index_tid_ = index_schema->get_table_id();
index_dml_info.rowkey_cnt_ = index_schema->get_rowkey_column_num();
index_dml_info.part_cnt_ = index_schema->get_partition_cnt();
index_dml_info.index_type_ = index_schema->get_index_type();
if (OB_FAIL(index_schema->get_index_name(index_dml_info.index_name_))) {
LOG_WARN("get index name from index schema failed", K(ret));
} else if (OB_FAIL(insert_stmt->add_multi_table_dml_info(index_dml_info))) {