Skip to content
/ server Public

MDEV-21543: Speed up VARCHAR pad space handling in multibyte collations #4625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MohamedM216 wants to merge 3 commits into
base: main
Choose a base branch
from
+76 −33
Open

MDEV-21543: Speed up VARCHAR pad space handling in multibyte collations #4625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0e5ffa
MDEV-21543: Speed up VARCHAR pad space handling in multibyte collations
MohamedM216 Feb 2, 2026
409a07d
clean up
MohamedM216 Feb 12, 2026
a1a9268
Merge branch 'main' of github.com:MariaDB/server into fix-hp_rec_key_…
MohamedM216 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions include/m_ctype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,16 @@ my_ci_strnncollsp(CHARSET_INFO *ci,
return (ci->coll->strnncollsp)(ci, a, alen, b, blen);
}

static inline int
my_ci_strnncollsp_nchars(CHARSET_INFO *ci,
const uchar *a, size_t alen,
const uchar *b, size_t blen,
size_t nchars,
uint flags)
{
return (ci->coll->strnncollsp_nchars)(ci, a, alen, b, blen, nchars, flags);
}


static inline my_bool
my_ci_like_range(CHARSET_INFO *ci,
Expand Down
99 changes: 66 additions & 33 deletions storage/heap/hp_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,41 +415,61 @@ int hp_rec_key_cmp(HP_KEYDEF *keydef, const uchar *rec1, const uchar *rec2)
{
uchar *pos1= (uchar*) rec1 + seg->start;
uchar *pos2= (uchar*) rec2 + seg->start;
size_t char_length1, char_length2;
size_t len1, len2;
size_t pack_length= seg->bit_start;
CHARSET_INFO *cs= seg->charset;
if (pack_length == 1)
{
char_length1= (size_t) *(uchar*) pos1++;
char_length2= (size_t) *(uchar*) pos2++;
len1= (size_t) *(uchar*) pos1++;
len2= (size_t) *(uchar*) pos2++;
}
else
{
char_length1= uint2korr(pos1);
char_length2= uint2korr(pos2);
len1= uint2korr(pos1);
len2= uint2korr(pos2);
pos1+= 2;
pos2+= 2;
}
Copy link
Contributor

@abarkov abarkov Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add a comment here:
/*
We're not using my_ci_strnncollsp_nchars() here for NOPAD collations
because some virtual implementations do not work correctly. For details see:
https://jira.mariadb.org/browse/MDEV-38712
*/

if (cs->mbmaxlen > 1)
/*
We're not using my_ci_strnncollsp_nchars() here for NOPAD collations
because some virtual implementations do not work correctly. For details see:
https://jira.mariadb.org/browse/MDEV-38712
*/
if (cs->mbmaxlen > 1 && !(cs->state && MY_CS_NOPAD))
{
size_t safe_length1= char_length1;
size_t safe_length2= char_length2;
size_t char_length= seg->length / cs->mbmaxlen;
char_length1= hp_charpos(cs, pos1, pos1 + char_length1, char_length);
set_if_smaller(char_length1, safe_length1);
char_length2= hp_charpos(cs, pos2, pos2 + char_length2, char_length);
set_if_smaller(char_length2, safe_length2);
size_t nchars= seg->length / cs->mbmaxlen;
if (my_ci_strnncollsp_nchars(cs,
pos1, len1,
pos2, len2,
nchars,
MY_STRNNCOLLSP_NCHARS_EMULATE_TRIMMED_TRAILING_SPACES))
return 1;
}
else
{
set_if_smaller(char_length1, seg->length);
set_if_smaller(char_length2, seg->length);
size_t char_length1= len1;
size_t char_length2= len2;

if (cs->mbmaxlen > 1)
{
size_t safe_length1= char_length1;
size_t safe_length2= char_length2;
size_t char_length= seg->length / cs->mbmaxlen;
char_length1= hp_charpos(cs, pos1, pos1 + char_length1, char_length);
set_if_smaller(char_length1, safe_length1);
char_length2= hp_charpos(cs, pos2, pos2 + char_length2, char_length);
set_if_smaller(char_length2, safe_length2);
}
else
{
set_if_smaller(char_length1, seg->length);
set_if_smaller(char_length2, seg->length);
}
if (my_ci_strnncollsp(seg->charset,
pos1, char_length1,
pos2, char_length2))
return 1;
}

if (my_ci_strnncollsp(seg->charset,
pos1, char_length1,
pos2, char_length2))
return 1;
}
else
{
Expand Down Expand Up @@ -530,22 +550,35 @@ int hp_key_cmp(HP_KEYDEF *keydef, const uchar *rec, const uchar *key)
size_t char_length_key= uint2korr(key);
pos+= pack_length;
key+= 2; /* skip key pack length */
if (cs->mbmaxlen > 1)
if (cs->mbmaxlen > 1 && !(cs->state && MY_CS_NOPAD))
{
size_t char_length1, char_length2;
char_length1= char_length2= seg->length / cs->mbmaxlen;
char_length1= hp_charpos(cs, key, key + char_length_key, char_length1);
set_if_smaller(char_length_key, char_length1);
char_length2= hp_charpos(cs, pos, pos + char_length_rec, char_length2);
set_if_smaller(char_length_rec, char_length2);
size_t nchars= seg->length / cs->mbmaxlen;
if (my_ci_strnncollsp_nchars(cs,
pos, char_length_rec,
key, char_length_key,
nchars,
MY_STRNNCOLLSP_NCHARS_EMULATE_TRIMMED_TRAILING_SPACES))
return 1;
}
else
set_if_smaller(char_length_rec, seg->length);

if (my_ci_strnncollsp(seg->charset,
pos, char_length_rec,
key, char_length_key))
return 1;
{
if (cs->mbmaxlen > 1)
{
size_t char_length1, char_length2;
char_length1= char_length2= seg->length / cs->mbmaxlen;
char_length1= hp_charpos(cs, key, key + char_length_key, char_length1);
set_if_smaller(char_length_key, char_length1);
char_length2= hp_charpos(cs, pos, pos + char_length_rec, char_length2);
set_if_smaller(char_length_rec, char_length2);
}
else
set_if_smaller(char_length_rec, seg->length);

if (my_ci_strnncollsp(seg->charset,
pos, char_length_rec,
key, char_length_key))
return 1;
}
}
else
{
Expand Down