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

In pdml update, column_conv expr may produce loop.

Browse Source
This commit is contained in:
my0
2021-10-28 10:52:07 +08:00
committed by LINxiansheng
parent b01b3ee539
commit 9b6599d966
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/optimizer/ob_log_insert.cpp
View File

@ -1023,17 +1023,28 @@ int ObLogInsert::set_hash_dist_column_exprs(ObExchangeInfo& exch_info, uint64_t
K(info), K(info),
K(ret)); K(ret));
} }
ObSEArray<ObRawExpr *, 4> except_exprs;
for (int64_t k = 0; OB_SUCC(ret) && k < info.rowkey_cnt_; ++k) { for (int64_t k = 0; OB_SUCC(ret) && k < info.rowkey_cnt_; ++k) {
ObRawExpr *target_expr = info.column_exprs_.at(k); ObRawExpr *target_expr = info.column_exprs_.at(k);
for (int64_t i = 0; OB_SUCC(ret) && i < column_convert_exprs_->count(); i++) { for (int64_t j = 0; OB_SUCC(ret) && j < column_convert_exprs_->count(); j++) {
if (OB_FAIL(ObRawExprUtils::replace_ref_column( if (OB_FAIL(ObRawExprUtils::replace_ref_column(
target_expr, table_columns_->at(i), column_convert_exprs_->at(i)))) { target_expr, table_columns_->at(j), column_convert_exprs_->at(j), NULL, &except_exprs))) {
LOG_WARN("fail to replace ref column", K(ret)); LOG_WARN("fail to replace ref column", K(ret));
} else if (OB_FAIL(except_exprs.push_back(column_convert_exprs_->at(j)))) {
LOG_WARN("push expr into array failed", K(ret));
} }
} }
OZ(rowkey_exprs.push_back(target_expr)); if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(rowkey_exprs.push_back(target_expr))) {
LOG_WARN("push target expr into rowkey array failed", K(ret));
}
}
if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(exch_info.append_hash_dist_expr(rowkey_exprs))) {
LOG_WARN("append rowkey array after exch info array failed", K(ret));
} }
OZ(exch_info.append_hash_dist_expr(rowkey_exprs));
found = true; found = true;
break; break;
} }