diff --git a/.gitmodules b/.gitmodules index 488b0a7f38f51e0cfb2dfccc021e20b81f40bce1..38f62b493edd702920cee75bc06f8259b7e42467 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "logmessage"] path = deps/logmessage - url = git@github.com:oceanbase/oblogmsg.git + url = https://github.com/oceanbase/oblogmsg.git branch = master \ No newline at end of file diff --git a/src/share/object/ob_obj_cast.cpp b/src/share/object/ob_obj_cast.cpp index 6373d1b39561bf87816931fb94367861a758c189..8102a5a082c08598830ed0796b44ac3fe292ef96 100644 --- a/src/share/object/ob_obj_cast.cpp +++ b/src/share/object/ob_obj_cast.cpp @@ -1603,10 +1603,10 @@ static int float_number( if (OB_UNLIKELY(ObFloatTC != in.get_type_class() || ObNumberTC != ob_obj_type_class(expect_type))) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("invalid input type", K(ret), K(in), K(expect_type)); - } else if (isnan(value)) { + } else if (std::isnan(value)) { ret = OB_INVALID_NUMERIC; LOG_WARN("float_number failed ", K(ret), K(value)); - } else if (isinf(value)) { + } else if (std::isinf(value)) { ret = OB_NUMERIC_OVERFLOW; LOG_WARN("float_number failed", K(ret), K(value)); } else if (ObUNumberType == expect_type && CAST_FAIL(numeric_negative_check(value))) { @@ -1908,10 +1908,10 @@ static int double_number( if (OB_UNLIKELY(ObDoubleTC != in.get_type_class() || ObNumberTC != ob_obj_type_class(expect_type))) { ret = OB_ERR_UNEXPECTED; LOG_ERROR("invalid input type", K(ret), K(in), K(expect_type)); - } else if (isnan(value) && lib::is_oracle_mode()) { + } else if (std::isnan(value) && lib::is_oracle_mode()) { ret = OB_INVALID_NUMERIC; LOG_WARN("float_number failed ", K(ret), K(value)); - } else if (isinf(value) && lib::is_oracle_mode()) { + } else if (std::isinf(value) && lib::is_oracle_mode()) { ret = OB_NUMERIC_OVERFLOW; LOG_WARN("float_number failed", K(ret), K(value)); } else if (ObUNumberType == expect_type && CAST_FAIL(numeric_negative_check(value))) { diff --git a/src/share/object/ob_obj_cast.h b/src/share/object/ob_obj_cast.h index 0e7f227adb1b80aae4a72a43c6ea08213bd78388..ec04c01dd96c1400f0c75d6c225a68bb145a0b35 100644 --- a/src/share/object/ob_obj_cast.h +++ b/src/share/object/ob_obj_cast.h @@ -21,6 +21,7 @@ #include "lib/charset/ob_charset.h" #include "share/ob_errno.h" + namespace oceanbase { namespace common {