From 085f9a7c6caa0f5d4d580015cc28f1c071b68ed8 Mon Sep 17 00:00:00 2001 From: hamstersox <673144759@qq.com> Date: Tue, 15 Nov 2022 09:35:31 +0000 Subject: [PATCH] add rpc flag --- deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h | 1 + src/sql/engine/expr/ob_expr_to_outfile_row.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h b/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h index d8f52d1af4..f3fbb95f9a 100644 --- a/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h +++ b/deps/oblib/src/rpc/obrpc/ob_rpc_packet_list.h @@ -805,6 +805,7 @@ PCODE_DEF(OB_CHECK_BACKUP_DEST_CONNECTIVITY, 0x1423) PCODE_DEF(OB_BACKUP_META, 0x1424) PCODE_DEF(OB_BACKUP_CHECK_TABLET_CREATE_TS, 0x1425) PCODE_DEF(OB_DELETE_POLICY, 0x1426) +// 0x1427 for OB_RECOVER_TABLE // backup and restore end 0x14ff // logservice diff --git a/src/sql/engine/expr/ob_expr_to_outfile_row.cpp b/src/sql/engine/expr/ob_expr_to_outfile_row.cpp index 1a444ecf56..5c10a8ef37 100644 --- a/src/sql/engine/expr/ob_expr_to_outfile_row.cpp +++ b/src/sql/engine/expr/ob_expr_to_outfile_row.cpp @@ -280,9 +280,9 @@ int ObExprToOutfileRow::print_wchar_to_buf(char *buf, const int64_t buf_len, int int ret = OB_SUCCESS; int result_len = 0; if (OB_FAIL(ObCharset::wc_mb(coll_type, wchar, buf + pos, buf_len - pos, result_len))) { - LOG_WARN("failed to convert wc to mb"); - } else { - pos += result_len; + LOG_WARN("failed to convert wc to mb"); + } else { + pos += result_len; } return ret; }