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

fix bug replace into core in copy_datum_memory

Browse Source
This commit is contained in:
yishenglanlingzui
2022-11-14 05:11:24 +00:00
committed by wangzelin.wzl
parent 27eb478a81
commit 8aa5f18458
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,8 +401,7 @@ int ObTableReplaceOp::get_next_conflict_rowkey(DASTaskIter &task_iter)
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_))) {
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));
}
@ -518,7 +517,7 @@ int ObTableReplaceOp::replace_conflict_row_cache()
bool same_row = false;
CK(OB_NOT_NULL(delete_row));
// dup checker依赖table column exprs
OZ(delete_row->to_expr(get_primary_table_old_row(), eval_ctx_));
OZ(delete_row->to_expr_skip_const(get_primary_table_old_row(), eval_ctx_));
// 外键的检查已经下方到dml_service逻辑中了
OZ(ObDMLService::process_delete_row(del_ctdef, del_rtdef, skip_delete, *this));
@ -531,7 +530,7 @@ int ObTableReplaceOp::replace_conflict_row_cache()
}
}
OZ(replace_row->to_expr(get_primary_table_new_row(), eval_ctx_));
OZ(replace_row->to_expr_skip_const(get_primary_table_new_row(), eval_ctx_));
OZ(ObDMLService::process_insert_row(ins_ctdef, ins_rtdef, *this, is_skipped));
// TODO(yikang): fix trigger related for heap table
if (OB_SUCC(ret) && ins_ctdef.is_primary_index_ && OB_FAIL(TriggerHandle::do_handle_after_row(*this,
@ -576,8 +575,8 @@ 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(get_primary_table_old_row(),
eval_ctx_))) {
if (OB_FAIL(constraint_value.baseline_datum_row_->to_expr_skip_const(
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))) {
LOG_WARN("shuffle delete row failed", K(ret), K(constraint_value));
@ -600,8 +599,8 @@ 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(get_primary_table_new_row(),
eval_ctx_))) {
if (OB_FAIL(constraint_value.current_datum_row_->to_expr_skip_const(
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))) {
LOG_WARN("shuffle insert row failed", K(ret), K(constraint_value));

18
src/sql/engine/expr/ob_expr_to_outfile_row.cpp
View File

@ -64,14 +64,14 @@ int ObExprToOutfileRow::calc_result_typeN(ObExprResType &type,
types[PARAM_LINE].set_calc_type(ObVarcharType);
types[PARAM_LINE].set_calc_collation_type(types[PARAM_LINE].get_collation_type());
// closed_cht
types[PARAM_ENCLOSED].set_calc_type(ObVarcharType);
types[PARAM_ENCLOSED].set_calc_collation_type(types[PARAM_ENCLOSED].get_collation_type());
// is_optional
types[PARAM_ENCLOSED].set_calc_type(ObVarcharType);
types[PARAM_ENCLOSED].set_calc_collation_type(types[PARAM_ENCLOSED].get_collation_type());
// is_optional
types[PARAM_OPTIONAL].set_calc_type(ObTinyIntType);
// escaped_cht
types[PARAM_ESCAPED].set_calc_type(ObVarcharType);
types[PARAM_ESCAPED].set_calc_collation_type(types[PARAM_ESCAPED].get_collation_type());
}
types[PARAM_ESCAPED].set_calc_type(ObVarcharType);
types[PARAM_ESCAPED].set_calc_collation_type(types[PARAM_ESCAPED].get_collation_type());
}
return ret;
}
@ -181,9 +181,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
ObObj obj;
OZ(v.to_obj(obj, obj_meta, expr.args_[i]->obj_datum_map_));
OZ(print_field(buf, buf_len, pos, obj, *out_info));
// print field terminator
if (OB_SUCC(ret) && i != expr.arg_cnt_ - 1) {
OZ(out_info->field_.print_plain_str_literal(buf, buf_len, pos, out_info->print_params_));
// print field terminator
if (OB_SUCC(ret) && i != expr.arg_cnt_ - 1) {
OZ(out_info->field_.print_plain_str_literal(buf, buf_len, pos, out_info->print_params_));
}
}
OZ(out_info->line_.print_plain_str_literal(buf, buf_len, pos, out_info->print_params_));