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

fix charset introducer bug

Browse Source
This commit is contained in:
SevenJ-swj
2023-05-25 16:47:20 +00:00
committed by ob-robot
parent bde491413b
commit e1e0ebaeb6
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/sql/resolver/ob_resolver_utils.cpp
View File

@ -1982,7 +1982,8 @@ int ObResolverUtils::resolve_stmt_type(const ParseResult &result, stmt::StmtType
return ret; return ret;
} }
int ObResolverUtils::set_string_val_charset(ObObjParam &val, ObString &charset, ObObj &result_val, int ObResolverUtils::set_string_val_charset(ObIAllocator &allocator,
ObObjParam &val, ObString &charset, ObObj &result_val,
bool is_strict_mode, bool is_strict_mode,
bool return_ret) bool return_ret)
{ {
@ -2001,6 +2002,24 @@ int ObResolverUtils::set_string_val_charset(ObObjParam &val, ObString &charset,
val.get_string_len())); val.get_string_len()));
val.set_length(length); val.set_length(length);
//pad 0 front.
const ObCharsetInfo *cs = ObCharset::get_charset(collation_type);
if (OB_ISNULL(cs)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error", K(ret));
} else if (cs->mbminlen > 0 && val.get_string_len() % cs->mbminlen != 0) {
int64_t align_offset = cs->mbminlen - val.get_string_len() % cs->mbminlen;
char *buf = NULL;
if (OB_UNLIKELY(NULL == (buf = static_cast<char*>(allocator.alloc(val.get_string_len() + align_offset))))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret));
} else {
MEMSET(buf, 0, align_offset);
MEMCPY(buf + align_offset, val.get_string_ptr(), val.get_string_len());
val.set_string(val.get_type(), buf, static_cast<int32_t>(val.get_string_len() + align_offset));
}
}
// 为了跟mysql报错一样，这里检查一下字符串是否合法，仅仅是检查，不合法则报错，不做其他操作 // 为了跟mysql报错一样，这里检查一下字符串是否合法，仅仅是检查，不合法则报错，不做其他操作
// check_well_formed_str的ret_error参数为true的时候，is_strict_mode参数失效，因此这里is_strict_mode直接传入true // check_well_formed_str的ret_error参数为true的时候，is_strict_mode参数失效，因此这里is_strict_mode直接传入true
if (OB_SUCC(ret) && OB_FAIL(ObSQLUtils::check_well_formed_str(val, result_val, is_strict_mode, return_ret))) { if (OB_SUCC(ret) && OB_FAIL(ObSQLUtils::check_well_formed_str(val, result_val, is_strict_mode, return_ret))) {
@ -2092,7 +2111,7 @@ int ObResolverUtils::resolve_const(const ParseNode *node,
// for STRING without collation, e.g. show tables like STRING; // for STRING without collation, e.g. show tables like STRING;
if (lib::is_mysql_mode() && is_nchar) { if (lib::is_mysql_mode() && is_nchar) {
ObString charset(strlen("utf8mb4"), "utf8mb4"); ObString charset(strlen("utf8mb4"), "utf8mb4");
if (OB_FAIL(set_string_val_charset(val, charset, result_val, false, false))) { if (OB_FAIL(set_string_val_charset(allocator, val, charset, result_val, false, false))) {
LOG_WARN("set string val charset failed", K(ret)); LOG_WARN("set string val charset failed", K(ret));
} }
} else { } else {
@ -2112,7 +2131,7 @@ int ObResolverUtils::resolve_const(const ParseNode *node,
ObCollationType collation_type = CS_TYPE_INVALID; ObCollationType collation_type = CS_TYPE_INVALID;
if (charset_node != NULL) { if (charset_node != NULL) {
ObString charset(charset_node->str_len_, charset_node->str_value_); ObString charset(charset_node->str_len_, charset_node->str_value_);
if (OB_FAIL(set_string_val_charset(val, charset, result_val, false, false))) { if (OB_FAIL(set_string_val_charset(allocator, val, charset, result_val, false, false))) {
LOG_WARN("set string val charset failed", K(ret)); LOG_WARN("set string val charset failed", K(ret));
} }
} }

3
src/sql/resolver/ob_resolver_utils.h
View File

@ -344,7 +344,8 @@ public:
const ObSQLMode mode, const ObSQLMode mode,
bool is_from_pl = false); bool is_from_pl = false);
static int set_string_val_charset(ObObjParam &val, static int set_string_val_charset(ObIAllocator &allocator,
ObObjParam &val,
ObString &charset, ObString &charset,
ObObj &result_val, ObObj &result_val,
bool is_strict_mode, bool is_strict_mode,