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

adjust the conversion between gb18030 and gb18030_2022

Browse Source
This commit is contained in:
xianyu-w
2023-05-04 12:23:11 +00:00
committed by ob-robot
parent 03ed5b7544
commit b7de32a0a4
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2807,6 +2807,15 @@ int ObCharset::charset_convert(const ObCollationType from_type,
} else {
ObCharsetInfo *from_cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[from_type]);
ObCharsetInfo *to_cs = static_cast<ObCharsetInfo*>(ObCharset::charset_arr[to_type]);
ObCharsetType src_cs = ObCharset::charset_type_by_coll(from_type);
ObCharsetType dst_cs = ObCharset::charset_type_by_coll(to_type);
if ((src_cs == CHARSET_GB18030 && dst_cs == CHARSET_GB18030_2022) ||
(src_cs == CHARSET_GB18030_2022 && dst_cs == CHARSET_GB18030)) {
/** GB18030 and GB18030_2022 have the same code points,
* but they have different mapping to unicode.
* So, we do charset_convert from the charset to the same charset*/
to_cs = from_cs;
}
if (OB_ISNULL(from_cs) || OB_ISNULL(to_cs)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected collation type", K(ret), K(from_type), K(to_type));