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

fix WhiteScan CHECKED_RETURN

Browse Source
This commit is contained in:
tj0
2021-09-14 20:11:25 +08:00
committed by wangzelin.wzl
parent ad8e3075af
commit 6e4b5bcd72
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/object/ob_obj_cast.cpp
View File

@ -8082,10 +8082,12 @@ int obj_collation_check(const bool is_strict_mode, const ObCollationType cs_type
int64_t well_formed_len = 0; int64_t well_formed_len = 0;
if (ob_is_lob_locator(obj.get_type())) { if (ob_is_lob_locator(obj.get_type())) {
if (OB_FAIL(obj.get_string(str))) { if (OB_FAIL(obj.get_string(str))) {
STORAGE_LOG(WARN, "Failed to get payload from lob locator", K(ret), K(obj)); LOG_WARN("Failed to get payload from lob locator", K(ret), K(obj));
} }
} else { } else {
obj.get_string(str); if (OB_FAIL(obj.get_string(str))) {
LOG_WARN("Failed to get payload from string", K(ret), K(obj));
}
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {

4
src/sql/engine/expr/ob_expr_cast.cpp
View File

@ -573,7 +573,9 @@ int ObExprCast::calc_result2(ObObj& result, const ObObj& obj1, const ObObj& obj2
} else { } else {
buf_obj1 = *to_type_obj; buf_obj1 = *to_type_obj;
buf_obj1.set_collation(result_type_); buf_obj1.set_collation(result_type_);
buf_obj1.get_string(text); if (OB_FAIL(buf_obj1.get_string(text))) {
LOG_WARN("Failed to get buf_obj1 string", K(ret));
}
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {