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

[CP] fix table location generate wrong key_exprs

Browse Source
This commit is contained in:
obdev
2022-05-05 14:15:44 +08:00
committed by wangzelin.wzl
parent cb3e9eacc2
commit 829cfdecfa
4 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sql/optimizer/ob_table_location.cpp
View File

@ -4594,12 +4594,6 @@ int ObTableLocation::record_insert_part_info(ObInsertStmt& insert_stmt, ObSQLSes
const ObIArray<ObRawExpr*>* value_vector = NULL;
const int64_t part_column_count = partition_columns.count();
if (NULL != table_columns && table_columns->count() > 1) {
if (0 == table_columns->at(0)->get_table_name().case_compare("sg1")) {
LOG_DEBUG("shaoge table");
}
}
ObSEArray<ObColumnRefRawExpr*, 4> value_desc_heap_table;
ObSEArray<ObRawExpr*, 4> value_vector_heap_table;
if (insert_stmt.get_part_generated_col_dep_cols().count() == 0) {
@ -4628,11 +4622,23 @@ int ObTableLocation::record_insert_part_info(ObInsertStmt& insert_stmt, ObSQLSes
}
} else {
for (int64_t value_idx = 0; OB_SUCC(ret) && value_idx < value_desc_count; ++value_idx) {
if (OB_ISNULL(value_desc->at(value_idx))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("value desc expr is null");
} else {
if (OB_FAIL(value_need_idx.push_back(value_idx))) {
// Value with subquery can't be calculated, remove it from value_need_idx.
// Previous code already guarantee that part key not contain subquery.
bool has_subquery = false;
for (int64_t j = value_idx; OB_SUCC(ret) && !has_subquery && j < value_count; j += value_desc_count) {
ObRawExpr *expr = value_vector->at(j);
if (OB_ISNULL(expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get null expr", K(ret), K(j));
} else if (expr->has_flag(CNT_SUB_QUERY) || expr->has_flag(CNT_EXEC_PARAM)) {
has_subquery = true;
}
}
if (OB_SUCC(ret) && !has_subquery) {
if (OB_ISNULL(value_desc->at(value_idx))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("value desc expr is null");
} else if (OB_FAIL(value_need_idx.push_back(value_idx))) {
LOG_WARN("Failed to add value idx", K(ret));
}
}