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

fix set user variable bug

Browse Source
This commit is contained in:
wjhh2008
2023-08-25 08:10:28 +00:00
committed by ob-robot
parent 0375e39154
commit 51e87fbb70
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/common/object/ob_obj_funcs.h vendored
View File

@ -1188,7 +1188,7 @@ inline int obj_print_plain_str<ObHexStringType>(const ObObj &obj, char *buffer,
if (CHARSET_BINARY == src_type && lib::is_mysql_mode()) { \
ret = obj_print_sql<ObHexStringType>(obj, buffer, length, pos, params); \
} else if (OB_FAIL(databuff_printf(buffer, length, pos, "'"))) { \
} else if (src_type == dst_type || src_type == CHARSET_INVALID) { \
} else if (src_type == dst_type || src_type == CHARSET_INVALID || CHARSET_BINARY == dst_type) { \
ObHexEscapeSqlStr sql_str(obj.get_string(), params.skip_escape_); \
pos += sql_str.to_string(buffer + pos, length - pos); \
ret = databuff_printf(buffer, length, pos, "'"); \

18
src/observer/mysql/obmp_utils.cpp
View File

@ -634,18 +634,32 @@ int ObMPUtils::get_user_sql_literal(ObIAllocator &allocator, const ObObj &obj, O
int64_t pos = 0;
const bool is_plain = false;
int64_t user_sql_print_length = 0;
bool need_cast_collation = lib::is_mysql_mode() && obj.is_string_type()
&& ObCharset::is_valid_collation(obj.get_collation_type())
&& CS_TYPE_BINARY != obj.get_collation_type();
int64_t extra_length = need_cast_collation ? 100 : 0;
if (OB_FAIL(get_literal_print_length(obj, is_plain, user_sql_print_length, print_param))) {
LOG_WARN("fail to get buffer length", K(ret), K(obj), K(user_sql_print_length));
} else if (OB_UNLIKELY(user_sql_print_length <= 0)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("Invalid buffer length", K(ret), K(obj), K(user_sql_print_length));
} else if (NULL == (data = static_cast<char *>(allocator.alloc(user_sql_print_length)))) {
} else if (NULL == (data = static_cast<char *>(allocator.alloc(user_sql_print_length + extra_length)))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_ERROR("fail to alloc mem", K(user_sql_print_length), K(ret));
} else if (OB_FAIL(obj.print_sql_literal(data, user_sql_print_length, pos, print_param))) {
LOG_WARN("fail to print sql literal", K(ret), K(pos), K(user_sql_print_length), K(obj));
} else {
value_str.assign_ptr(data, static_cast<uint32_t>(pos));
value_str = ObString(static_cast<uint32_t>(user_sql_print_length + extra_length), static_cast<uint32_t>(pos), data);
if (need_cast_collation) {
#define STR_WITH_LEN(str) (str),strlen((str))
value_str.write_front(STR_WITH_LEN("cast("));
value_str.write(STR_WITH_LEN(" as char charset "));
value_str.write(STR_WITH_LEN(ObCharset::get_charset(obj.get_collation_type())->csname));
value_str.write(STR_WITH_LEN(")"));
value_str.write(STR_WITH_LEN(" collate "));
value_str.write(STR_WITH_LEN(ObCharset::get_charset(obj.get_collation_type())->name));
#undef STR_WITH_LEN
}
}
return ret;
}