mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-30 18:36:12 +01:00 
			
		
		
		
	 10c063f9f0
			
		
	
	
	10c063f9f0
	
	
	
		
			
			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.
		
	
			
		
			
				
	
	
		
			196 lines
		
	
	
	
		
			4.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			196 lines
		
	
	
	
		
			4.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef CTYPE_UCA_H
 | |
| #define CTYPE_UCA_H
 | |
| /* Copyright (c) 2021, MariaDB
 | |
| 
 | |
|    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 */
 | |
| 
 | |
| #define MY_UCA_VERSION_ID(x,y,z)  ((uint) ((x) * 100 + (y) * 10 + (z)))
 | |
| 
 | |
| /*
 | |
|   Implicit weight handling is done according to
 | |
|   the section "Computing Implicit Weights" in
 | |
|     https://unicode.org/reports/tr10/#Values_For_Base_Table
 | |
|   (as of Unicode 14.0.0)
 | |
| 
 | |
|   Implicit weights for a code CP are constructed as follows:
 | |
|     [.AAAA.0020.0002][.BBBB.0000.0000]
 | |
| 
 | |
|   - There are two primary weights, depending on the character type and block.
 | |
|   - There is one weight on the secondary and tertiary levels.
 | |
| 
 | |
|   AAAA and BBBB are computed using different formulas for:
 | |
|   - Siniform ideographic scripts
 | |
|   - Han
 | |
|   - Unassigned characters
 | |
| */
 | |
| 
 | |
| typedef struct my_uca_implict_weight_t
 | |
| {
 | |
|   uint16 weight[2];
 | |
| } MY_UCA_IMPLICIT_WEIGHT;
 | |
| 
 | |
| 
 | |
| /*
 | |
|   By default, implicit weights for a code CP are constructed as follows:
 | |
|     [.AAAA.0020.0002][.BBBB.0000.0000]
 | |
| 
 | |
|   where AAAA and BBBB are :
 | |
|     AAAA= BASE + (CP >> 15);
 | |
|     BBBB= (CP & 0x7FFF) | 0x8000;
 | |
| 
 | |
|   This formula covers the following implicit weight subtypes:
 | |
|   - Core Han Unified Ideographs
 | |
|   - All other Han Unified Ideographs
 | |
|   - Unassigned characters
 | |
|   Every mentioned subtype passes a different BASE.
 | |
| 
 | |
|   This formula does not cover Siniform ideographic scripts.
 | |
|   They are handled by separate functions.
 | |
| */
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_implicit_weight_primary_default(uint16 base, my_wc_t code)
 | |
| {
 | |
|   MY_UCA_IMPLICIT_WEIGHT res;
 | |
|   res.weight[0]= (uint16) ((code >> 15) + base);
 | |
|   res.weight[1]= (uint16) ((code & 0x7FFF)|0x8000);
 | |
|   return res;
 | |
| }
 | |
| 
 | |
| 
 | |
| /**
 | |
|   Calculate Unicode-5.2.0 implicit weight on the primary level.
 | |
| 
 | |
|   According to UCA, BASE is calculated as follows:
 | |
|   - FB40 for Unified_Ideograph=True AND
 | |
|              ((Block=CJK_Unified_Ideograph) OR
 | |
|               (Block=CJK_Compatibility_Ideographs))
 | |
|   - FB80 for Unified_Ideograph=True AND NOT
 | |
|              ((Block=CJK_Unified_Ideograph) OR
 | |
|               (Block=CJK_Compatibility_Ideographs))
 | |
|   - FBC0 for any other code point
 | |
| 
 | |
|   But for Unicode-5.2.0 and Unicode-4.0.0 we used
 | |
|   a simplified formula as implemented before.
 | |
| */
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_520_implicit_weight_primary(my_wc_t code)
 | |
| {
 | |
|   uint16 base;
 | |
|   /*
 | |
|   3400;<CJK Ideograph Extension A, First>
 | |
|   4DB5;<CJK Ideograph Extension A, Last>
 | |
|   4E00;<CJK Ideograph, First>
 | |
|   9FA5;<CJK Ideograph, Last>
 | |
|   */
 | |
|   if (code >= 0x3400 && code <= 0x4DB5)
 | |
|     base= 0xFB80;
 | |
|   else if (code >= 0x4E00 && code <= 0x9FA5)
 | |
|     base= 0xFB40;
 | |
|   else
 | |
|     base= 0xFBC0;
 | |
| 
 | |
|   return my_uca_implicit_weight_primary_default(base, code);
 | |
| }
 | |
| 
 | |
| 
 | |
| typedef enum my_cs_encoding_enum
 | |
| {
 | |
|   MY_CS_ENCODING_UTF8MB3= 0,
 | |
|   MY_CS_ENCODING_UTF8MB4= 1,
 | |
|   MY_CS_ENCODING_UCS2= 2,
 | |
|   MY_CS_ENCODING_UTF16= 3,
 | |
|   MY_CS_ENCODING_UTF32= 4,
 | |
| } my_cs_encoding_t;
 | |
| 
 | |
| #define MY_CS_ENCODING_LAST MY_CS_ENCODING_UTF32
 | |
| 
 | |
| 
 | |
| 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;
 | |
| 
 | |
| 
 | |
| #include "ctype-uca1400.h"
 | |
| #include "ctype-uca0900.h"
 | |
| 
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_implicit_weight_primary(uint version, my_wc_t code)
 | |
| {
 | |
|   return version >= 1400 ?
 | |
|          my_uca_1400_implicit_weight_primary(code) :
 | |
|          my_uca_520_implicit_weight_primary(code);
 | |
| }
 | |
| 
 | |
| 
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_implicit_weight_secondary()
 | |
| {
 | |
|   MY_UCA_IMPLICIT_WEIGHT res;
 | |
|   res.weight[0]= 0x0020;
 | |
|   res.weight[1]= 0;
 | |
|   return res;
 | |
| }
 | |
| 
 | |
| 
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_implicit_weight_tertiary()
 | |
| {
 | |
|   MY_UCA_IMPLICIT_WEIGHT res;
 | |
|   res.weight[0]= 0x0002;
 | |
|   res.weight[1]= 0;
 | |
|   return res;
 | |
| }
 | |
| 
 | |
| 
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_implicit_weight_quaternary()
 | |
| {
 | |
|   MY_UCA_IMPLICIT_WEIGHT res;
 | |
|   res.weight[0]= 0x0001;
 | |
|   res.weight[1]= 0;
 | |
|   return res;
 | |
| }
 | |
| 
 | |
| 
 | |
| static inline MY_UCA_IMPLICIT_WEIGHT
 | |
| my_uca_implicit_weight_on_level(uint version, my_wc_t code, uint level)
 | |
| {
 | |
|   switch (level) {
 | |
|   case 0:
 | |
|     return my_uca_implicit_weight_primary(version, code);
 | |
|   case 1:
 | |
|     return my_uca_implicit_weight_secondary();
 | |
|   case 2:
 | |
|     return my_uca_implicit_weight_tertiary();
 | |
|   default:
 | |
|     break;
 | |
|   }
 | |
|   return my_uca_implicit_weight_quaternary();
 | |
| }
 | |
| 
 | |
| uint
 | |
| my_ci_get_id_uca(CHARSET_INFO *cs, my_collation_id_type_t type);
 | |
| 
 | |
| 
 | |
| LEX_CSTRING
 | |
| my_ci_get_collation_name_uca(CHARSET_INFO *cs, my_collation_name_mode_t mode);
 | |
| 
 | |
| 
 | |
| #endif /* CTYPE_UCA_H */
 |