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

[CP] [to #43172849] ignore OB_TIER_END in dbms_job_utils

Browse Source
This commit is contained in:
obdev
2022-11-15 07:42:43 +00:00
committed by wangzelin.wzl
parent a9c4677e35
commit 0c50f30b7a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/observer/dbms_job/ob_dbms_job_utils.cpp
View File

@ -363,7 +363,9 @@ int ObDBMSJobUtils::get_dbms_job_infos_in_tenant(
} else if (OB_NOT_NULL(result.get_result())) { } else if (OB_NOT_NULL(result.get_result())) {
do { do {
if (OB_FAIL(result.get_result()->next())) { if (OB_FAIL(result.get_result()->next())) {
LOG_WARN("failed to get result", K(ret)); if (ret != OB_ITER_END) {
LOG_WARN("failed to get result from result", K(ret));
}
} else { } else {
ObDBMSJobInfo job_info; ObDBMSJobInfo job_info;
OZ (extract_info(*(result.get_result()), allocator, job_info)); OZ (extract_info(*(result.get_result()), allocator, job_info));

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

@ -262,9 +262,9 @@ int ObExprToOutfileRow::print_field(char *buf, const int64_t buf_len, int64_t &p
OZ(copy_string_to_buf(buf, buf_len, pos, code_point)); OZ(copy_string_to_buf(buf, buf_len, pos, code_point));
} else { } else {
OZ(copy_string_to_buf(buf, buf_len, pos, code_point)); OZ(copy_string_to_buf(buf, buf_len, pos, code_point));
} }
return ret; return ret;
}; };
ObString tmp_str(out_info.tmp_buf_len_, tmp_pos, out_info.tmp_buf_); ObString tmp_str(out_info.tmp_buf_len_, tmp_pos, out_info.tmp_buf_);
OZ(ObCharsetUtils::foreach_char(tmp_str, out_info.print_params_.cs_type_, escape_func)); OZ(ObCharsetUtils::foreach_char(tmp_str, out_info.print_params_.cs_type_, escape_func));
} }