mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
MDEV-36213 Doubled memory usage (11.4.4 <-> 11.4.5)
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.
This commit is contained in:
@@ -1119,7 +1119,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general_ci_handler =
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -1140,7 +1141,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general_mysql500_ci_handler =
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -1161,7 +1163,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_bin_handler =
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -1182,7 +1185,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_general_nopad_ci_handler =
|
||||
my_min_str_mb_simple_nopad,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -1203,7 +1207,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb3_nopad_bin_handler =
|
||||
my_min_str_mb_simple_nopad,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -1529,7 +1534,8 @@ static MY_COLLATION_HANDLER my_collation_cs_handler =
|
||||
my_hash_sort_utf8mb3,
|
||||
my_propagate_simple,
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple
|
||||
my_max_str_mb_simple,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
struct charset_info_st my_charset_utf8mb3_general_cs=
|
||||
@@ -2848,7 +2854,8 @@ static MY_COLLATION_HANDLER my_collation_filename_handler =
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
static MY_CHARSET_HANDLER my_charset_filename_handler=
|
||||
@@ -3393,6 +3400,19 @@ my_charlen_utf8mb4(CHARSET_INFO *cs __attribute__((unused)),
|
||||
}
|
||||
|
||||
|
||||
static my_bool
|
||||
my_ci_eq_collation_utf8mb4_bin(CHARSET_INFO *a, CHARSET_INFO *b)
|
||||
{
|
||||
return a->cset == b->cset &&
|
||||
a->coll == b->coll &&
|
||||
a->uca == b->uca && a->uca == NULL &&
|
||||
a->casefold == b->casefold &&
|
||||
(a->state & MY_CS_NOPAD) == (b->state & MY_CS_NOPAD) &&
|
||||
a->levels_for_order == b->levels_for_order &&
|
||||
a->tailoring == b->tailoring && a->tailoring == NULL;
|
||||
}
|
||||
|
||||
|
||||
#define MY_FUNCTION_NAME(x) my_ ## x ## _utf8mb4
|
||||
#define CHARLEN(cs,str,end) my_charlen_utf8mb4(cs,str,end)
|
||||
#define DEFINE_WELL_FORMED_CHAR_LENGTH_USING_CHARLEN
|
||||
@@ -3475,7 +3495,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_general_ci_handler=
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -3496,7 +3517,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_bin_handler =
|
||||
my_min_str_mb_simple,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_utf8mb4_bin
|
||||
};
|
||||
|
||||
|
||||
@@ -3517,7 +3539,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_general_nopad_ci_handler=
|
||||
my_min_str_mb_simple_nopad,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_generic
|
||||
};
|
||||
|
||||
|
||||
@@ -3538,7 +3561,8 @@ static MY_COLLATION_HANDLER my_collation_utf8mb4_nopad_bin_handler =
|
||||
my_min_str_mb_simple_nopad,
|
||||
my_max_str_mb_simple,
|
||||
my_ci_get_id_generic,
|
||||
my_ci_get_collation_name_generic
|
||||
my_ci_get_collation_name_generic,
|
||||
my_ci_eq_collation_utf8mb4_bin
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user