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

[LWG] fix print lock_wait_node core error when repost failed

Browse Source
This commit is contained in:
obdev
2022-11-14 05:08:45 +00:00
committed by wangzelin.wzl
parent a890291041
commit 27eb478a81
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,9 @@ int ObExprToOutfileRow::calc_result_typeN(ObExprResType &type,
types[PARAM_FIELD].set_calc_type(ObVarcharType); types[PARAM_FIELD].set_calc_type(ObVarcharType);
types[PARAM_FIELD].set_calc_collation_type(types[PARAM_FIELD].get_collation_type()); types[PARAM_FIELD].set_calc_collation_type(types[PARAM_FIELD].get_collation_type());
// line_str // line_str
types[PARAM_LINE].set_calc_type(ObVarcharType); types[PARAM_LINE].set_calc_type(ObVarcharType);
types[PARAM_LINE].set_calc_collation_type(types[PARAM_LINE].get_collation_type()); types[PARAM_LINE].set_calc_collation_type(types[PARAM_LINE].get_collation_type());
// closed_cht // closed_cht
types[PARAM_ENCLOSED].set_calc_type(ObVarcharType); types[PARAM_ENCLOSED].set_calc_type(ObVarcharType);
types[PARAM_ENCLOSED].set_calc_collation_type(types[PARAM_ENCLOSED].get_collation_type()); types[PARAM_ENCLOSED].set_calc_collation_type(types[PARAM_ENCLOSED].get_collation_type());
// is_optional // is_optional
@ -72,9 +72,9 @@ int ObExprToOutfileRow::calc_result_typeN(ObExprResType &type,
types[PARAM_ESCAPED].set_calc_type(ObVarcharType); 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_collation_type(types[PARAM_ESCAPED].get_collation_type());
} }
return ret; return ret;
} }
int ObExprToOutfileRow::cg_expr(ObExprCGCtx &, const ObRawExpr &, ObExpr &expr) const int ObExprToOutfileRow::cg_expr(ObExprCGCtx &, const ObRawExpr &, ObExpr &expr) const
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -178,9 +178,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
for (int64_t i = PARAM_SELECT_ITEM; OB_SUCC(ret) && i < expr.arg_cnt_; i++) { for (int64_t i = PARAM_SELECT_ITEM; OB_SUCC(ret) && i < expr.arg_cnt_; i++) {
ObDatum &v = expr.locate_param_datum(ctx, i); ObDatum &v = expr.locate_param_datum(ctx, i);
const ObObjMeta &obj_meta = expr.args_[i]->obj_meta_; const ObObjMeta &obj_meta = expr.args_[i]->obj_meta_;
ObObj obj; ObObj obj;
OZ(v.to_obj(obj, obj_meta, expr.args_[i]->obj_datum_map_)); OZ(v.to_obj(obj, obj_meta, expr.args_[i]->obj_datum_map_));
OZ(print_field(buf, buf_len, pos, obj, *out_info)); OZ(print_field(buf, buf_len, pos, obj, *out_info));
// print field terminator // print field terminator
if (OB_SUCC(ret) && i != expr.arg_cnt_ - 1) { 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->field_.print_plain_str_literal(buf, buf_len, pos, out_info->print_params_));

2
src/storage/memtable/ob_lock_wait_mgr.cpp
View File

@ -666,7 +666,7 @@ int ObLockWaitMgr::repost(Node* node)
UnregisterPath:: UnregisterPath::
LOCK_WAIT_MGR_REPOST); LOCK_WAIT_MGR_REPOST);
if (OB_FAIL(OBSERVER.get_net_frame().get_deliver().repost((void*)node))) { if (OB_FAIL(OBSERVER.get_net_frame().get_deliver().repost((void*)node))) {
TRANS_LOG(WARN, "report error", K(ret), K(*node)); TRANS_LOG(WARN, "report error", K(ret));
} }
} }