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

update expr no in 31x opensource

Browse Source
This commit is contained in:
xf0 2021-09-08 14:22:24 +08:00 committed by wangzelin.wzl
parent a701bfb296
commit ea087416e4
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/sql/engine/expr/ob_expr_eval_functions.cpp
View File

@ -666,15 +666,55 @@ static ObExpr::EvalFunc g_expr_eval_functions[] = {
ObExprTimeFormat::calc_time_format, /* 407 */
ObExprMakedate::calc_makedate, /* 408 */
ObExprPeriodAdd::calc_periodadd, /* 409 */
ObExprExportSet::eval_export_set, /* 410 */
ObExprConvertTZ::eval_convert_tz, /* 411 */
ObExprInet6Aton::calc_inet6_aton, /* 412 */
ObExprIsIpv4::calc_is_ipv4, /* 413 */
ObExprIsIpv6::calc_is_ipv6, /* 414 */
ObExprIsIpv4Mapped::calc_is_ipv4_mapped, /* 415 */
ObExprIsIpv4Compat::calc_is_ipv4_compat, /* 416 */
ObExprInetAton::calc_inet_aton, /* 417 */
ObExprInet6Ntoa::calc_inet6_ntoa, /* 418 */
NULL, /* 410 */
NULL, /* 411 */
NULL, /* 412 */
NULL, /* 413 */
NULL, /* 414 */
NULL, /* 415 */
NULL, /* 416 */
NULL, /* 417 */
NULL, /* 418 */
NULL, /* 419 */
NULL, /* 420 */
NULL, /* 421 */
NULL, /* 422 */
NULL, /* 423 */
NULL, /* 424 */
NULL, /* 425 */
NULL, /* 426 */
NULL, /* 427 */
NULL, /* 428 */
NULL, /* 429 */
NULL, /* 430 */
NULL, /* 431 */
NULL, /* 432 */
NULL, /* 433 */
NULL, /* 434 */
NULL, /* 435 */
NULL, /* 436 */
NULL, /* 437 */
NULL, /* 438 */
NULL, /* 439 */
NULL, /* 440 */
NULL, /* 441 */
NULL, /* 442 */
NULL, /* 443 */
NULL, /* 444 */
NULL, /* 445 */
NULL, /* 446 */
NULL, /* 447 */
NULL, /* 448 */
NULL, /* 449 */
ObExprExportSet::eval_export_set, /* 450 */
ObExprInet6Aton::calc_inet6_aton, /* 451 */
ObExprIsIpv4::calc_is_ipv4, /* 452 */
ObExprIsIpv6::calc_is_ipv6, /* 453 */
ObExprIsIpv4Mapped::calc_is_ipv4_mapped, /* 454 */
ObExprIsIpv4Compat::calc_is_ipv4_compat, /* 455 */
ObExprInetAton::calc_inet_aton, /* 456 */
ObExprInet6Ntoa::calc_inet6_ntoa, /* 457 */
ObExprConvertTZ::eval_convert_tz, /* 458 */
};
REG_SER_FUNC_ARRAY(OB_SFA_SQL_EXPR_EVAL, g_expr_eval_functions, ARRAYSIZEOF(g_expr_eval_functions));

5
src/sql/engine/expr/ob_expr_inet.cpp
View File

@ -344,10 +344,7 @@ int ObExprInetAton::ob_inet_aton(T& result, const ObString& text, bool& is_ip_fo
{
int ret = OB_SUCCESS;
is_ip_format_invalid = false;
if (OB_UNLIKELY(OB_ISNULL(text.ptr()))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ip format invalid, text is null", K(ret));
}else if (0 == text.length()) {
if (text.empty()) {
is_ip_format_invalid = true;
LOG_WARN("ip length is zero");
} else {