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

fix bug replace into with timestamp type datum_memory use after free

Browse Source
This commit is contained in:
yishenglanlingzui
2022-11-21 13:08:02 +00:00
committed by wangzelin.wzl
parent 0d4f96af5b
commit d06c642de3
1 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/sql/engine/dml/ob_table_replace_op.cpp
View File

@ -499,56 +499,70 @@ int ObTableReplaceOp::replace_conflict_row_cache()
ObReplaceRtDef &replace_rtdef = replace_rtdefs_.at(0); ObReplaceRtDef &replace_rtdef = replace_rtdefs_.at(0);
ObInsRtDef &ins_rtdef = replace_rtdef.ins_rtdef_; ObInsRtDef &ins_rtdef = replace_rtdef.ins_rtdef_;
ObDelRtDef &del_rtdef = replace_rtdef.del_rtdef_; ObDelRtDef &del_rtdef = replace_rtdef.del_rtdef_;
const ObChunkDatumStore::StoredRow *replace_row = NULL;
NG_TRACE_TIMES(2, replace_start_shuff); NG_TRACE_TIMES(2, replace_start_shuff);
OZ(replace_row_store_.begin(replace_row_iter)); if (OB_FAIL(replace_row_store_.begin(replace_row_iter))) {
const ObChunkDatumStore::StoredRow *replace_row = NULL; LOG_WARN("begin replace_row_store failed", K(ret), K(replace_row_store_.get_row_cnt()));
}
// 构建冲突的hash map的时候也使用的是column_ref， 回表也是使用的column_ref expr来读取scan的结果 // 构建冲突的hash map的时候也使用的是column_ref， 回表也是使用的column_ref expr来读取scan的结果
// 因为constarain_info中使用的column_ref expr，所以此处需要使用table_column_old_exprs (column_ref exprs) // 因为constarain_info中使用的column_ref expr，所以此处需要使用table_column_old_exprs (column_ref exprs)
while (OB_SUCC(ret) && OB_SUCC(replace_row_iter.get_next_row(get_primary_table_new_row(), while (OB_SUCC(ret) && OB_SUCC(replace_row_iter.get_next_row(replace_row))) {
eval_ctx_,
&replace_row))) {
constraint_values.reuse(); constraint_values.reuse();
ObChunkDatumStore::StoredRow *insert_new_row = NULL; ObChunkDatumStore::StoredRow *insert_new_row = NULL;
OZ(conflict_checker_.check_duplicate_rowkey(replace_row, if (OB_ISNULL(replace_row)) {
constraint_values, ret = OB_ERR_UNEXPECTED;
false)); LOG_WARN("replace_row is null", K(ret));
} else if (OB_FAIL(conflict_checker_.check_duplicate_rowkey(replace_row,
constraint_values,
false))) {
LOG_WARN("check rowkey from conflict_checker failed", K(ret), KPC(replace_row));
}
for (int64_t i = 0; OB_SUCC(ret) && i < constraint_values.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < constraint_values.count(); ++i) {
//delete duplicated row //delete duplicated row
const ObChunkDatumStore::StoredRow *delete_row = constraint_values.at(i).current_datum_row_; const ObChunkDatumStore::StoredRow *delete_row = constraint_values.at(i).current_datum_row_;
bool same_row = false; bool same_row = false;
CK(OB_NOT_NULL(delete_row)); if (OB_ISNULL(delete_row)) {
// dup checker依赖table column exprs ret = OB_ERR_UNEXPECTED;
OZ(delete_row->to_expr_skip_const(get_primary_table_old_row(), eval_ctx_)); LOG_WARN("delete row failed", K(ret));
} else if (OB_FAIL(delete_row->to_expr_skip_const(get_primary_table_old_row(), eval_ctx_))) {
// 外键的检查已经下方到dml_service逻辑中了 // dup checker依赖table column exprs
OZ(ObDMLService::process_delete_row(del_ctdef, del_rtdef, skip_delete, *this)); LOG_WARN("flush delete_row to old_row failed", K(ret), KPC(delete_row), K(get_primary_table_old_row()));
OZ(conflict_checker_.delete_old_row(delete_row, ObNewRowSource::FROM_INSERT)); } else if (OB_FAIL(ObDMLService::process_delete_row(del_ctdef, del_rtdef, skip_delete, *this))) {
if (OB_SUCC(ret) && OB_LIKELY(MY_SPEC.only_one_unique_key_)) { LOG_WARN("process delete row failed", K(ret), KPC(delete_row), K(get_primary_table_old_row()));
OZ(check_values(same_row, replace_row, delete_row)); } else if (OB_FAIL(conflict_checker_.delete_old_row(delete_row, ObNewRowSource::FROM_INSERT))) {
LOG_WARN("delete old_row from conflict checker failed", K(ret), KPC(delete_row));
} else if (MY_SPEC.only_one_unique_key_) {
if (OB_FAIL(check_values(same_row, replace_row, delete_row))) {
LOG_WARN("check value failed", K(ret), KPC(replace_row), KPC(delete_row));
}
} }
if (OB_SUCC(ret) && !same_row) { if (OB_SUCC(ret) && !same_row) {
delete_rows_++; delete_rows_++;
} }
} }
OZ(replace_row->to_expr_skip_const(get_primary_table_new_row(), eval_ctx_)); if (OB_FAIL(ret)) {
OZ(ObDMLService::process_insert_row(ins_ctdef, ins_rtdef, *this, is_skipped)); // do nothing
// TODO(yikang): fix trigger related for heap table } else if (OB_FAIL(replace_row->to_expr_skip_const(get_primary_table_new_row(), eval_ctx_))) {
if (OB_SUCC(ret) && ins_ctdef.is_primary_index_ && OB_FAIL(TriggerHandle::do_handle_after_row(*this, LOG_WARN("flush replace_row to exprs failed", K(ret), KPC(replace_row));
ins_ctdef.trig_ctdef_, } else if (OB_FAIL(ObDMLService::process_insert_row(ins_ctdef, ins_rtdef, *this, is_skipped))) {
ins_rtdef.trig_rtdef_, LOG_WARN("convert exprs to stored_row failed", K(ret), KPC(insert_new_row));
ObTriggerEvents::get_insert_event()))) { } else if (ins_ctdef.is_primary_index_ &&
OB_FAIL(TriggerHandle::do_handle_after_row(*this,
ins_ctdef.trig_ctdef_,
ins_rtdef.trig_rtdef_,
ObTriggerEvents::get_insert_event()))) {
LOG_WARN("failed to handle before trigger", K(ret)); LOG_WARN("failed to handle before trigger", K(ret));
} } else if (OB_UNLIKELY(is_skipped)) {
if (OB_SUCC(ret) && OB_UNLIKELY(is_skipped)) {
continue; continue;
} else if (OB_FAIL(conflict_checker_.convert_exprs_to_stored_row(get_primary_table_new_row(),
insert_new_row))) {
LOG_WARN("convert exprs to stored_row failed", K(ret), KPC(insert_new_row));
} else if (OB_FAIL(conflict_checker_.insert_new_row(insert_new_row, ObNewRowSource::FROM_INSERT))) {
LOG_WARN("insert new to conflict_checker failed", K(ret), KPC(insert_new_row));
} }
OZ(conflict_checker_.convert_exprs_to_stored_row(get_primary_table_new_row(),
insert_new_row));
// add new row to conflict_checker map
// 在insert_new_row 函数内部，会把replace_row to_expr到table_column_exprs<column_ref type>中
OZ(conflict_checker_.insert_new_row(insert_new_row, ObNewRowSource::FROM_INSERT));
} // while row store end } // while row store end
ret = OB_ITER_END == ret ? OB_SUCCESS : ret; ret = OB_ITER_END == ret ? OB_SUCCESS : ret;
return ret; return ret;