mirror of
https://github.com/MariaDB/server.git
synced 2025-04-20 22:25:30 +02:00

Fixing the code adding MySQL _0900_ collations as _uca1400_ aliases not to perform deep initialization of the corresponding _uca1400_ collations. Only basic initialization is now performed which allows to watch these collations (both _0900_ and _uca1400_) in queries to INFORMATION_SCHEMA tables COLLATIONS and COLLATION_CHARACTER_SET_APPLICABILITY, as well as in SHOW COLLATION statements. Deep initialization is now performed only when a collation (either the _0900_ alias or the corresponding _uca1400_ collation) is used for the very first time after the server startup. Refactoring was done to maintain the code easier: - most of the _uca1400_ code was moved from ctype-uca.c to a new file ctype-uca1400.c - most of the _0900_ code was moved from type-uca.c to a new file ctype-uca0900.c Change details: - The original function add_alias_for_collation() added by the patch for "MDEV-20912 Add support for utf8mb4_0900_* collations in MariaDB Server" was removed from mysys/charset.c, as it had two two problems: a. it forced deep initialization of the _uca1400_ collations when adding _0900_ aliases for them at the server startup (the main reported problem) b. the collation initialization code in add_alias_for_collation() was related more to collations rather than to memory management, so /strings should be a better place for it than /mysys. The code from add_alias_for_collation() was split into separate functions. Cyclic dependency was removed. `#include <my_sys.h>` was removed from /strings/ctype-uca.c. Collations are now added using a callback function MY_CHARSET_LOADED::add_collation, like it is done for user collations defined in Index.xml. The code in /mysys sets MY_CHARSET_LOADED::add_collation to add_compiled_collation(). - The function compare_collations() was removed. A new virtual function was added into my_collation_handler_st instead: my_bool (*eq_collation)(CHARSET_INFO *self, CHARSET_INFO *other); because it is the collation handler who knows how to detect equal collations by comparing only some of CHARSET_INFO members without their deep initialization. Three implementations were added: - my_ci_eq_collation_uca() for UCA collations, it compares _0900_ collations as equal to their corresponding _uca1400_ collations. - my_ci_eq_collation_utf8mb4_bin(), it compares utf8mb4_nopad_bin and utf8mb4_0900_bin as equal. - my_ci_eq_collation_generic() - the default implementation, which compares all collations as not equal. A C++ wrapper CHARSET_INFO::eq_collations() was added. The code in /sql was changes to use the wrapper instead of the former calls for the removed function compare_collations(). - A part of add_alias_for_collation() was moved into a new function my_ci_alloc(). It allocates a memory for a new charset_info_st instance together with the collation name and the comment using a single MY_CHARSET_LOADER::once_alloc call, which points to my_once_alloc() in the server. - A part of add_alias_for_collation() was moved into a new function my_ci_make_comment_for_alias(). It makes an "Alias for xxx" string, e.g. "Alias for utf8mb4_uca1400_swedish_ai_ci" in case of utf8mb4_sv_0900_ai_ci. - A part of the code in create_tailoring() was moved to a new function my_uca1400_collation_get_initialized_shared_uca(), to reuse the code between _uca1400_ and _0900_ collations. - A new function my_collation_id_is_mysql_uca0900() was added in addition to my_collation_id_is_mysql_uca1400(). - Functions to build collation names were added: my_uca0900_collation_build_name() my_uca1400_collation_build_name() - A shared function function was added: my_bool my_uca1400_collation_alloc_and_init(MY_CHARSET_LOADER *loader, LEX_CSTRING name, LEX_CSTRING comment, const uca_collation_def_param_t *param, uint id) It's reused to add _uca1400_ and _0900_ collations, with basic initialization (without deep initialization). - The function add_compiled_collation() changed its return type from void to int, to make it compatible with MY_CHARSET_LOADER::add_collation. - Functions mysql_uca0900_collation_definition_add(), mysql_uca0900_utf8mb4_collation_definitions_add(), mysql_utf8mb4_0900_bin_add() were added into ctype-uca0900.c. They get MY_CHARSET_LOADER as a parameter. - Functions my_uca1400_collation_definition_add(), my_uca1400_collation_definitions_add() were moved from charset-def.c to strings/ctype-uca1400.c. The latter now accepts MY_CHARSET_LOADER as the first parameter instead of initializing a MY_CHARSET_LOADER inside. - init_compiled_charsets() now initializes a MY_CHARSET_LOADER variable and passes it to all functions adding collations: - mysql_utf8mb4_0900_collation_definitions_add() - mysql_uca0900_utf8mb4_collation_definitions_add() - mysql_utf8mb4_0900_bin_add() - A new structure was added into ctype-uca.h: typedef struct uca_collation_def_param { my_cs_encoding_t cs_id; uint tailoring_id; uint nopad_flags; uint level_flags; } uca_collation_def_param_t; It simplifies reusing the code for _uca1400_ and _0900_ collations. - The definition of MY_UCA1400_COLLATION_DEFINITION was moved from ctype-uca.c to ctype-uca1400.h, to reuse the code for _uca1400_ and _0900_ collations. - The definitions of "MY_UCA_INFO my_uca_v1400" and "MY_UCA_INFO my_uca1400_info_tailored[][]" were moved from ctype-uca.c to ctype-uca1400.c. - The definitions/declarations of: - mysql_0900_collation_start, - struct mysql_0900_to_mariadb_1400_mapping - mysql_0900_to_mariadb_1400_mapping - mysql_utf8mb4_0900_collation_definitions_add() were moved from ctype-uca.c to ctype-uca0900.c - Functions my_uca1400_make_builtin_collation_id() my_uca1400_collation_definition_init() my_uca1400_collation_id_uca400_compat() my_ci_get_collation_name_uca1400_context() were moved from ctype-uca.c to ctype-uca1400.c and ctype-uca1400.h - A part of my_uca1400_collation_definition_init() was moved into my_uca0520_builtin_collation_by_id(), to make functions smaller.
363 lines
12 KiB
C
363 lines
12 KiB
C
/* Copyright (c) 2025, MariaDB Corporation
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; version 2
|
|
of the License.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
|
|
MA 02110-1335 USA */
|
|
|
|
#include "strings_def.h"
|
|
#include "m_ctype.h"
|
|
#include "ctype-uca.h"
|
|
#include "ctype-uca0520.h"
|
|
#include "ctype-unidata.h"
|
|
#include "ctype-uca1400data.h"
|
|
|
|
/*
|
|
Return UCA-4.0.0 compatible ID (known since MySQL-4.1),
|
|
e.g. for use in the protocol with the old clients.
|
|
*/
|
|
uint my_uca1400_collation_id_uca400_compat(uint id)
|
|
{
|
|
uint tlid= my_uca1400_collation_id_to_tailoring_id(id);
|
|
my_cs_encoding_t csid= my_uca1400_collation_id_to_charset_id(id);
|
|
const MY_UCA1400_COLLATION_DEFINITION *def;
|
|
DBUG_ASSERT(my_collation_id_is_uca1400(id));
|
|
if (!(def= &my_uca1400_collation_definitions[tlid])->name)
|
|
return id;
|
|
switch (csid) {
|
|
case MY_CS_ENCODING_UTF8MB3: return def->id_utf8mb3;
|
|
case MY_CS_ENCODING_UTF8MB4: return def->id_utf8mb4;
|
|
case MY_CS_ENCODING_UCS2: return def->id_ucs2;
|
|
case MY_CS_ENCODING_UTF16: return def->id_utf16;
|
|
case MY_CS_ENCODING_UTF32: return def->id_utf32;
|
|
}
|
|
return id;
|
|
}
|
|
|
|
|
|
/*
|
|
Get a short (without the character set prefix) collation name
|
|
of a UCA-14.0.0 collation, e.g.
|
|
utf8mb4_uca1400_swedish_ai_ci -> uca1400_swedish_ai_ci
|
|
*/
|
|
LEX_CSTRING my_ci_get_collation_name_uca1400_context(CHARSET_INFO *cs)
|
|
{
|
|
LEX_CSTRING res;
|
|
DBUG_ASSERT(my_collation_id_is_uca1400(cs->number));
|
|
|
|
if (cs->coll_name.length <= cs->cs_name.length ||
|
|
cs->coll_name.str[cs->cs_name.length] != '_')
|
|
{
|
|
DBUG_ASSERT(0);
|
|
return cs->coll_name; /* Something went wrong, return the full name. */
|
|
}
|
|
res.str= cs->coll_name.str + cs->cs_name.length + 1;
|
|
res.length= cs->coll_name.length - cs->cs_name.length - 1;
|
|
return res;
|
|
}
|
|
|
|
|
|
/*
|
|
A preliminary initialized data for a UCA-14.0.0 collation.
|
|
The goal is to have the "logical position" members initialized (see below).
|
|
Weight tables are initialized later, at create_tailoring() time.
|
|
*/
|
|
MY_UCA_INFO my_uca_v1400=
|
|
{
|
|
{
|
|
{
|
|
0x10FFFF, /* maxchar */
|
|
(uchar *) uca1400_length,
|
|
(uint16 **) uca1400_weight,
|
|
{ /* Contractions: */
|
|
array_elements(uca1400_contractions), /* nitems */
|
|
uca1400_contractions, /* item */
|
|
NULL /* flags */
|
|
},
|
|
0, /* levelno */
|
|
{0}, /* contraction_hash */
|
|
NULL /* booster */
|
|
},
|
|
|
|
{
|
|
0x10FFFF, /* maxchar */
|
|
(uchar *) uca1400_length_secondary,
|
|
(uint16 **) uca1400_weight_secondary,
|
|
{ /* Contractions: */
|
|
array_elements(uca1400_contractions_secondary), /* nitems */
|
|
uca1400_contractions_secondary, /* item */
|
|
NULL /* flags */
|
|
},
|
|
1, /* levelno */
|
|
{0}, /* contraction_hash */
|
|
NULL /* booster */
|
|
},
|
|
|
|
{
|
|
0x10FFFF, /* maxchar */
|
|
(uchar *) uca1400_length_tertiary,
|
|
(uint16 **) uca1400_weight_tertiary,
|
|
{ /* Contractions: */
|
|
array_elements(uca1400_contractions_tertiary), /* nitems */
|
|
uca1400_contractions_tertiary, /* item */
|
|
NULL /* flags */
|
|
},
|
|
2, /* levelno */
|
|
{0}, /* contraction_hash */
|
|
NULL /* booster */
|
|
}
|
|
|
|
},
|
|
|
|
/* Logical positions */
|
|
uca1400_non_ignorable_first,
|
|
uca1400_non_ignorable_last,
|
|
|
|
uca1400_primary_ignorable_first,
|
|
uca1400_primary_ignorable_last,
|
|
|
|
uca1400_secondary_ignorable_first,
|
|
uca1400_secondary_ignorable_last,
|
|
|
|
uca1400_tertiary_ignorable_first,
|
|
uca1400_tertiary_ignorable_last,
|
|
|
|
0x0000, /* first_trailing */
|
|
0x0000, /* last_trailing */
|
|
|
|
uca1400_variable_first,
|
|
uca1400_variable_last,
|
|
|
|
/* Misc */
|
|
uca1400_version
|
|
};
|
|
|
|
|
|
/*
|
|
An array of MY_UCA_INFO (sorting tables).
|
|
Collations having the same character set and tailoring
|
|
(but different pad and accent/case sensitivity flags)
|
|
share the same array element. Also, aliases for MySQL-8.0
|
|
UCA-9.0.0 collations share the same array element with the
|
|
corresponding UCA-14.0.0 MariaDB collations.
|
|
|
|
For example, all these collation share one element of the array:
|
|
- utf8mb4_uca1400_swedish_ai_ci
|
|
- utf8mb4_uca1400_swedish_ai_cs
|
|
- utf8mb4_uca1400_swedish_as_ci
|
|
- utf8mb4_uca1400_swedish_as_cs
|
|
- utf8mb4_uca1400_swedish_nopad_ai_ci
|
|
- utf8mb4_uca1400_swedish_nopad_ai_cs
|
|
- utf8mb4_uca1400_swedish_nopad_as_ci
|
|
- utf8mb4_uca1400_swedish_nopad_as_cs
|
|
- utf8mb4_sv_0900_ai_ci
|
|
- utf8mb4_sv_0900_as_cs
|
|
*/
|
|
MY_UCA_INFO
|
|
my_uca1400_info_tailored[MY_CS_ENCODING_LAST+1]
|
|
[MY_UCA1400_COLLATION_DEFINITION_COUNT];
|
|
|
|
|
|
/*
|
|
Make an UCA-14.0.0 collation ID using its properties.
|
|
*/
|
|
uint my_uca1400_make_builtin_collation_id(my_cs_encoding_t charset_id,
|
|
uint tailoring_id,
|
|
my_bool nopad,
|
|
my_bool secondary_level,
|
|
my_bool tertiary_level)
|
|
{
|
|
if (!my_uca1400_collation_definitions[tailoring_id].tailoring)
|
|
return 0;
|
|
return MY_UCA1400_COLLATION_ID_POSSIBLE_MIN +
|
|
(charset_id << 8) +
|
|
(tailoring_id << 3) +
|
|
(nopad << 2) +
|
|
(secondary_level << 1) +
|
|
(tertiary_level << 0);
|
|
}
|
|
|
|
|
|
/*
|
|
Make an UCA-14.0.0 full collation name as a concatenation of its
|
|
- Character set name
|
|
- UCA version
|
|
- Language rules (tailoring)
|
|
- pad characteristics
|
|
- accent sensitivity
|
|
- case sensitivity
|
|
e.g.: "utf8mb4" + "_uca1400" + "_swedish" + "_as" + "_ci"
|
|
*/
|
|
LEX_CSTRING
|
|
my_uca1400_collation_build_name(char *buffer, size_t buffer_size,
|
|
const LEX_CSTRING *cs_name,
|
|
const char *tailoring_name,
|
|
const uca_collation_def_param_t *prm)
|
|
{
|
|
LEX_CSTRING res;
|
|
res.str= buffer;
|
|
res.length=
|
|
my_snprintf(buffer, buffer_size, "%.*s_uca1400%s%s%s%s%s",
|
|
(int) cs_name->length, cs_name->str,
|
|
tailoring_name[0] ? "_" : "",
|
|
tailoring_name,
|
|
prm->nopad_flags ? "_nopad" : "",
|
|
prm->level_flags & (1<<MY_CS_LEVEL_BIT_SECONDARY) ? "_as" : "_ai",
|
|
prm->level_flags & (1<<MY_CS_LEVEL_BIT_TERTIARY) ? "_cs" : "_ci");
|
|
return res;
|
|
}
|
|
|
|
|
|
/*
|
|
For extra safety let's define and check a set of flags
|
|
which are not expected for UCA 1400 collations.
|
|
*/
|
|
static inline uint
|
|
uca1400_unexpected_flags()
|
|
{
|
|
return MY_CS_BINSORT|
|
|
MY_CS_PRIMARY|
|
|
MY_CS_PUREASCII|
|
|
MY_CS_LOWER_SORT;
|
|
}
|
|
|
|
|
|
/*
|
|
Perform a preliminary initialization of a charset_info_st instance.
|
|
It's enough for SHOW and INFORMATION_SCHEMA queries.
|
|
Deep initialization will be done later, when the collation is
|
|
used for the first time. See create_tailoring().
|
|
*/
|
|
static void
|
|
my_uca1400_collation_definition_init(MY_CHARSET_LOADER *loader,
|
|
struct charset_info_st *dst,
|
|
const uca_collation_def_param_t *param)
|
|
{
|
|
const MY_UCA1400_COLLATION_DEFINITION *def=
|
|
&my_uca1400_collation_definitions[param->tailoring_id];
|
|
|
|
/* Copy the entire charset_info_st from an in-compiled one. */
|
|
*dst= *my_uca0520_builtin_collation_by_id(param->cs_id, param->nopad_flags);
|
|
|
|
/* Now replace some members according to param */
|
|
DBUG_ASSERT((dst->state & uca1400_unexpected_flags()) == 0);
|
|
dst->uca= &my_uca_v1400;
|
|
dst->tailoring= def->tailoring;
|
|
if (def->tailoring == my_charset_utf8mb4_turkish_uca_ci.tailoring)
|
|
dst->casefold= &my_casefold_unicode1400tr;
|
|
else
|
|
dst->casefold= &my_casefold_unicode1400;
|
|
|
|
dst->state|= param->nopad_flags;
|
|
my_ci_set_level_flags(dst, param->level_flags);
|
|
}
|
|
|
|
|
|
/*
|
|
Allocate memory for a new charset_info_st instance together
|
|
with its name and comment.
|
|
Perform preliminary initialization, then add to the list
|
|
of available collations using MY_CHARSET_LOADER::add_collation.
|
|
*/
|
|
my_bool
|
|
my_uca1400_collation_alloc_and_init(MY_CHARSET_LOADER *loader,
|
|
LEX_CSTRING name,
|
|
LEX_CSTRING comment,
|
|
const uca_collation_def_param_t *param,
|
|
uint id)
|
|
{
|
|
struct charset_info_st *dst;
|
|
|
|
if (!(dst= my_ci_alloc(loader, name, &name, comment, &comment)))
|
|
return TRUE;
|
|
|
|
my_uca1400_collation_definition_init(loader, dst, param);
|
|
|
|
dst->number= id;
|
|
dst->coll_name= name;
|
|
dst->comment= comment.str;
|
|
|
|
return (loader->add_collation)(dst) != 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Make an UCA-14.0.0 full collation name using its id,
|
|
then allocate and add the collation.
|
|
*/
|
|
static
|
|
my_bool my_uca1400_collation_definition_add(MY_CHARSET_LOADER *loader, uint id)
|
|
{
|
|
char coll_name_buffer[MY_CS_COLLATION_NAME_SIZE + 1];
|
|
LEX_CSTRING coll_name;
|
|
LEX_CSTRING comment= {"",0};
|
|
uca_collation_def_param_t param= my_uca1400_collation_param_by_id(id);
|
|
CHARSET_INFO *src= my_uca0520_builtin_collation_by_id(param.cs_id,
|
|
param.nopad_flags);
|
|
const MY_UCA1400_COLLATION_DEFINITION *def=
|
|
&my_uca1400_collation_definitions[param.tailoring_id];
|
|
|
|
coll_name= my_uca1400_collation_build_name(coll_name_buffer,
|
|
sizeof(coll_name_buffer),
|
|
&src->cs_name,
|
|
def->name,
|
|
¶m);
|
|
|
|
return my_uca1400_collation_alloc_and_init(loader, coll_name, comment,
|
|
¶m, id);
|
|
}
|
|
|
|
|
|
/*
|
|
Add UCA-14.0.0 collations for all combinations of:
|
|
- Unicode character sets (utf8mb3, utf8mb4, ucs2, utf16, utf32)
|
|
- language rules (tailorings)
|
|
- pad properties
|
|
- accent sensitivity
|
|
- case sensitivity
|
|
*/
|
|
my_bool my_uca1400_collation_definitions_add(MY_CHARSET_LOADER *loader)
|
|
{
|
|
my_cs_encoding_t charset_id;
|
|
for (charset_id= (my_cs_encoding_t) 0;
|
|
charset_id <= (my_cs_encoding_t) MY_CS_ENCODING_LAST;
|
|
charset_id++)
|
|
{
|
|
uint tailoring_id;
|
|
for (tailoring_id= 0 ;
|
|
tailoring_id < MY_UCA1400_COLLATION_DEFINITION_COUNT;
|
|
tailoring_id++)
|
|
{
|
|
my_bool nopad; /* PAD / NOPAD */
|
|
for (nopad= 0; nopad < 2; nopad++)
|
|
{
|
|
my_bool secondary_level; /* ai / as */
|
|
for (secondary_level= 0; secondary_level < 2; secondary_level++)
|
|
{
|
|
my_bool tertiary_level; /* ci / cs */
|
|
for (tertiary_level= 0; tertiary_level < 2; tertiary_level++)
|
|
{
|
|
uint id= my_uca1400_make_builtin_collation_id(charset_id,
|
|
tailoring_id,
|
|
nopad,
|
|
secondary_level,
|
|
tertiary_level);
|
|
if (id && my_uca1400_collation_definition_add(loader, id))
|
|
return TRUE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return FALSE;
|
|
}
|