update expr no in 31x opensource

2021-09-08 14:22:24 +08:00
parent a701bfb296
commit ea087416e4
2 changed files with 50 additions and 13 deletions
--- a/src/sql/engine/expr/ob_expr_inet.cpp
+++ b/src/sql/engine/expr/ob_expr_inet.cpp
@ -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 {