1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-23216: LONGTEXT column with collation doesn't sort

Browse Source 
An overflow was happening with LONGTEXT columns, when the length was converted to the length
in the strxfrm form (mem-comparable keys).
Introduced a function to truncate the length to the max_sort_length before calculating
the length of the strxfrm form.
This commit is contained in:
Varun Gupta 2020-07-23 15:30:29 +05:30
parent a8d5f57e9a
commit a18639f1a9
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/main/order_by.result
View File

@ -4079,4 +4079,22 @@ COUNT(DISTINCT a)
34
SET @@tmp_memory_table_size= @save_tmp_memory_table_size;
DROP TABLE t1;
#
# MDEV-23216: LONGTEXT column with collation doesn't sort
#
CREATE TABLE t1 (a LONGTEXT COLLATE utf8mb4_swedish_ci);
INSERT INTO t1 VALUES ('A'),('Z'),('B'),('Y');
SELECT * FROM t1 ORDER BY a;
a
A
B
Y
Z
SELECT * FROM t1 ORDER BY a DESC;
a
Z
Y
B
A
DROP TABLE t1;
# End of 10.5 tests

10
mysql-test/main/order_by.test
View File

@ -2522,5 +2522,15 @@ SELECT COUNT(DISTINCT a) FROM t1;
SET @@tmp_memory_table_size= @save_tmp_memory_table_size;
DROP TABLE t1;
--echo #
--echo # MDEV-23216: LONGTEXT column with collation doesn't sort
--echo #
CREATE TABLE t1 (a LONGTEXT COLLATE utf8mb4_swedish_ci);
INSERT INTO t1 VALUES ('A'),('Z'),('B'),('Y');
SELECT * FROM t1 ORDER BY a;
SELECT * FROM t1 ORDER BY a DESC;
DROP TABLE t1;
--echo # End of 10.5 tests

16
sql/filesort.cc
View File

@ -2102,9 +2102,7 @@ Type_handler_string_result::sort_length(THD *thd,
SORT_FIELD_ATTR *sortorder) const
{
CHARSET_INFO *cs;
sortorder->length= item->max_length;
set_if_smaller(sortorder->length, thd->variables.max_sort_length);
sortorder->original_length= item->max_length;
sortorder->set_length_and_original_length(thd, item->max_length);
if (use_strnxfrm((cs= item->collation.collation)))
{
@ -2211,9 +2209,9 @@ sortlength(THD *thd, Sort_keys *sort_keys, bool *allow_packing_for_sortkeys)
{
Field *field= sortorder->field;
CHARSET_INFO *cs= sortorder->field->sort_charset();
sortorder->length= sortorder->field->sort_length();
sortorder->set_length_and_original_length(thd, field->sort_length());
sortorder->suffix_length= sortorder->field->sort_suffix_length();
sortorder->original_length= sortorder->length;
sortorder->type= field->is_packable() ?
SORT_FIELD_ATTR::VARIABLE_SIZE :
SORT_FIELD_ATTR::FIXED_SIZE;
@ -2748,6 +2746,14 @@ bool SORT_FIELD_ATTR::check_if_packing_possible(THD *thd) const
}
void SORT_FIELD_ATTR::set_length_and_original_length(THD *thd, uint length_arg)
{
length= length_arg;
set_if_smaller(length, thd->variables.max_sort_length);
original_length= length_arg;
}
/*
Compare function used for packing sort keys
*/

1
sql/sql_class.h
View File

@ -6454,6 +6454,7 @@ struct SORT_FIELD_ATTR
uchar *b, size_t *b_len);
bool check_if_packing_possible(THD *thd) const;
bool is_variable_sized() { return type == VARIABLE_SIZE; }
void set_length_and_original_length(THD *thd, uint length_arg);
};