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

[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Browse Source 
Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65
2024-06-17 13:46:15 +00:00
committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ int ObExprSpatialCollection::calc_resultN(common::ObObj &result,
const ObString wkb_sub = wkb;
const char *data = wkb_sub.ptr() + WKB_OFFSET;
const uint64_t len = wkb_sub.length() - WKB_OFFSET;
if (res_wkb_buf.append(data, len)) {
if (OB_FAIL(res_wkb_buf.append(data, len))) {
LOG_WARN("fail to append sub data to res wkb buf", K(ret), K(wkb_sub), K(len));
}
}
@ -307,7 +307,7 @@ int ObExprSpatialCollection::eval_spatial_collection(const ObExpr &expr,
ret = OB_INVALID_ARGUMENT;
LOG_USER_ERROR(OB_INVALID_ARGUMENT, get_func_name());
LOG_WARN("unexpected sub geo type", K(ret), K(sub_type));
} else if (res_wkb_buf.append(data, len)) {
} else if (OB_FAIL(res_wkb_buf.append(data, len))) {
LOG_WARN("fail to append sub data to res wkb buf", K(ret), K(wkb_sub), K(len));
}
}