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

fix find in set bug

Browse Source
This commit is contained in:
wjhh2008
2023-08-15 07:18:46 +00:00
committed by ob-robot
parent 1cadc34c90
commit 2bb6877cdd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/engine/expr/ob_expr_find_in_set.cpp
View File

@ -128,18 +128,19 @@ int gen_sortkey(ObCollationType cs_type, ObIAllocator &allocator, ObString &elem
} else if (ObCharset::is_bin_sort(cs_type)) { } else if (ObCharset::is_bin_sort(cs_type)) {
sort_key = elem; sort_key = elem;
} else { } else {
bool is_valid_character = false;
const ObCharsetInfo *cs = ObCharset::get_charset(cs_type); const ObCharsetInfo *cs = ObCharset::get_charset(cs_type);
size_t buf_len = cs->coll->strnxfrmlen(cs, elem.length()) * cs->mbmaxlen; size_t buf_len = cs->coll->strnxfrmlen(cs, elem.length()) * cs->mbmaxlen;
ObArrayWrap<char> buffer; ObArrayWrap<char> buffer;
OZ (buffer.allocate_array(allocator, buf_len)); OZ (buffer.allocate_array(allocator, buf_len));
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
int64_t temp_len = 0;
if (OB_FAIL(ObCharset::well_formed_len(cs_type, elem.ptr(), elem.length(), temp_len))) {
LOG_WARN("invalid input string", KPHEX(elem.ptr(), elem.length()));
} else {
bool is_valid_character = false;
size_t sort_key_len = ObCharset::sortkey(cs_type, elem.ptr(), elem.length(), size_t sort_key_len = ObCharset::sortkey(cs_type, elem.ptr(), elem.length(),
buffer.get_data(), buf_len, is_valid_character); buffer.get_data(), buf_len, is_valid_character);
if (OB_UNLIKELY(!is_valid_character)) {
ret = OB_ERR_INCORRECT_STRING_VALUE;
} else {
sort_key.assign_ptr(buffer.get_data(), sort_key_len); sort_key.assign_ptr(buffer.get_data(), sort_key_len);
} }
} }