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

[FEAT MERGE]4_1_sql_feature

Browse Source 
Co-authored-by: leslieyuchen <leslieyuchen@gmail.com>
Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: raywill <hustos@gmail.com>
This commit is contained in:
obdev
2023-01-28 16:01:26 +08:00
committed by ob-robot
parent 3080f2b66f
commit 2d19a9d8f5
846 changed files with 161957 additions and 116661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,8 +402,8 @@ int ObTableReplaceOp::get_next_conflict_rowkey(DASTaskIter &task_iter)
} else if (OB_ISNULL(stored_row = ssr.get_store_row())) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("stored row is null", K(ret));
} else if (OB_FAIL(stored_row->to_expr_skip_const(
conflict_checker_.checker_ctdef_.data_table_rowkey_expr_, conflict_checker_.eval_ctx_))) {
} else if (OB_FAIL(stored_row->to_expr(
conflict_checker_.checker_ctdef_.data_table_rowkey_expr_,conflict_checker_.eval_ctx_))) {
if (OB_ITER_END != ret) {
LOG_WARN("get next row from result iterator failed", K(ret));
}
@ -526,7 +526,7 @@ int ObTableReplaceOp::replace_conflict_row_cache()
if (OB_ISNULL(delete_row)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("delete row failed", K(ret));
} else if (OB_FAIL(delete_row->to_expr_skip_const(get_primary_table_old_row(), eval_ctx_))) {
} else if (OB_FAIL(delete_row->to_expr(get_primary_table_old_row(), eval_ctx_))) {
// dup checker依赖table column exprs
LOG_WARN("flush delete_row to old_row failed", K(ret), KPC(delete_row), K(get_primary_table_old_row()));
} else if (OB_FAIL(ObDMLService::process_delete_row(del_ctdef, del_rtdef, skip_delete, *this))) {
@ -545,7 +545,7 @@ int ObTableReplaceOp::replace_conflict_row_cache()
if (OB_FAIL(ret)) {
// do nothing
} else if (OB_FAIL(replace_row->to_expr_skip_const(get_primary_table_new_row(), eval_ctx_))) {
} else if (OB_FAIL(replace_row->to_expr(get_primary_table_new_row(), eval_ctx_))) {
LOG_WARN("flush replace_row to exprs failed", K(ret), KPC(replace_row));
} else if (OB_FAIL(ObDMLService::process_insert_row(ins_ctdef, ins_rtdef, *this, is_skipped))) {
LOG_WARN("convert exprs to stored_row failed", K(ret), KPC(insert_new_row));
@ -591,7 +591,7 @@ int ObTableReplaceOp::do_delete(ObConflictRowMap *primary_map)
LOG_DEBUG("get one constraint_value from primary hash map", K(constraint_value));
if (NULL != constraint_value.baseline_datum_row_) {
//baseline row is not empty, delete it
if (OB_FAIL(constraint_value.baseline_datum_row_->to_expr_skip_const(
if (OB_FAIL(constraint_value.baseline_datum_row_->to_expr(
get_primary_table_old_row(), eval_ctx_))) {
LOG_WARN("stored row to expr faild", K(ret));
} else if (OB_FAIL(delete_row_to_das(false))) {
@ -615,7 +615,7 @@ int ObTableReplaceOp::do_insert(ObConflictRowMap *primary_map)
ObConflictValue &constraint_value = start_row_iter->second;
if (OB_SUCC(ret) && NULL != constraint_value.current_datum_row_) {
//current row is not empty, insert new row
if (OB_FAIL(constraint_value.current_datum_row_->to_expr_skip_const(
if (OB_FAIL(constraint_value.current_datum_row_->to_expr(
get_primary_table_new_row(), eval_ctx_))) {
LOG_WARN("stored row to expr faild", K(ret));
} else if (OB_FAIL(insert_row_to_das(false))) {