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

fix charset log print bug

Browse Source
This commit is contained in:
bf 2021-06-16 11:43:45 +08:00 committed by MizuhaHimuraki
parent d1a8226c32
commit d113832231
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
deps/oblib/src/lib/charset/ob_charset.cpp vendored
View File

@ -898,7 +898,6 @@ int ObCharset::like_range(ObCollationType collation_type, const ObString& like_s
LOG_ERROR("unexpected error. invalid argument(s)",
K(ret),
K(collation_type),
K(ObCharset::charset_arr[collation_type]),
K(max_str),
K(max_str_len),
K(min_str),
@ -937,7 +936,7 @@ size_t ObCharset::strlen_char(const ObCollationType collation_type, const char*
size_t ret = 0;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
@ -954,7 +953,7 @@ size_t ObCharset::strlen_byte_no_sp(const ObCollationType collation_type, const
size_t ret = 0;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
@ -973,7 +972,7 @@ int ObCharset::well_formed_len(
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else if (OB_UNLIKELY(NULL == str && 0 != str_len)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument, str is null and str_len is nonzero", KP(str), K(str_len), K(ret));
@ -1003,7 +1002,7 @@ int ObCharset::well_formed_len(ObCollationType collation_type, const char* str,
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else if (OB_UNLIKELY(NULL == str && 0 != str_len)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument, str is null and str_len is nonzero", KP(str), K(str_len), K(ret));
@ -1024,7 +1023,7 @@ size_t ObCharset::charpos(
size_t ret = 0;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
@ -1042,7 +1041,7 @@ size_t ObCharset::max_bytes_charpos(const ObCollationType collation_type, const
size_t ret = 0;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
@ -1062,7 +1061,7 @@ bool ObCharset::wildcmp(ObCollationType collation_type, const ObString& str, con
bool ret = false;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->coll)) {
@ -1094,7 +1093,7 @@ int ObCharset::mb_wc(ObCollationType collation_type, const ObString& mb, int32_t
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
ob_wc_t res_wc;
@ -1124,7 +1123,7 @@ int ObCharset::mb_wc(
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
ob_wc_t res_wc;
@ -1154,7 +1153,7 @@ int ObCharset::display_len(ObCollationType collation_type, const ObString& mb, i
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
@ -1199,7 +1198,7 @@ int ObCharset::max_display_width_charpos(ObCollationType collation_type, const c
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (OB_ISNULL(cs->cset)) {
@ -1675,7 +1674,7 @@ bool ObCharset::is_bin_sort(ObCollationType collation_type)
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
ret = (0 != (cs->state & OB_CS_BINSORT));
@ -1803,7 +1802,7 @@ int ObCharset::first_valid_char(
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else if (OB_UNLIKELY(NULL == buf)) {
ret = OB_NOT_INIT;
LOG_ERROR("Null buffer passed in", K(ret), K(buf));
@ -1994,7 +1993,7 @@ bool ObCharset::is_space(const ObCollationType collation_type, char c)
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
ret = (' ' == c);
@ -2008,7 +2007,7 @@ bool ObCharset::is_graph(const ObCollationType collation_type, char c)
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
ret = !!(((cs)->ctype + 1)[(unsigned char)(c)] & (_MY_PNT | _MY_U | _MY_L | _MY_NMR));
@ -2022,7 +2021,7 @@ bool ObCharset::usemb(const ObCollationType collation_type)
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
ret = (NULL != cs->cset->ismbchar);
@ -2036,7 +2035,7 @@ int ObCharset::is_mbchar(const ObCollationType collation_type, const char* str,
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
if (NULL != cs->cset->ismbchar) {
@ -2064,7 +2063,7 @@ int ObCharset::get_mbmaxlen_by_coll(const ObCollationType collation_type, int64_
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
mbmaxlen = cs->mbmaxlen;
@ -2079,7 +2078,7 @@ int ObCharset::get_mbminlen_by_coll(const ObCollationType collation_type, int64_
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR(
"unexpected error. invalid argument(s)", K(ret), K(collation_type), K(ObCharset::charset_arr[collation_type]));
"unexpected error. invalid argument(s)", K(ret), K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
mbminlen = cs->mbminlen;
@ -2335,7 +2334,7 @@ bool ObCharset::is_cs_nonascii(ObCollationType collation_type)
bool is_cs_nonascii = false;
if (OB_UNLIKELY(collation_type <= CS_TYPE_INVALID || collation_type >= CS_TYPE_MAX) ||
OB_ISNULL(ObCharset::charset_arr[collation_type])) {
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type), K(ObCharset::charset_arr[collation_type]));
LOG_ERROR("unexpected error. invalid argument(s)", K(collation_type));
} else {
ObCharsetInfo* cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[collation_type]);
is_cs_nonascii = !!(cs->state & OB_CS_NONASCII);