2011-10-19 21:45:18 +02:00
|
|
|
#ifndef STRINGS_DEF_INCLUDED
|
|
|
|
#define STRINGS_DEF_INCLUDED
|
2011-01-30 12:41:44 +02:00
|
|
|
/* Copyright (C) 2011 Monty Program Ab
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
Update FSF address
This commit is based on the work of Michal Schorm, rebased on the
earliest MariaDB version.
Th command line used to generate this diff was:
find ./ -type f \
-exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
-exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \
-exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \
-exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \
-exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \
-exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
2019-05-10 20:49:46 +03:00
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
|
2011-01-30 12:41:44 +02:00
|
|
|
|
|
|
|
/* This file is to be include first in all files in the string directory */
|
|
|
|
|
2017-07-03 11:35:44 +03:00
|
|
|
#undef DBUG_ASSERT_AS_PRINTF
|
2018-02-24 12:42:13 -05:00
|
|
|
#include <my_global.h> /* Define standard vars */
|
|
|
|
#include "m_string.h" /* Exernal definitions of string functions */
|
2024-08-17 12:56:28 +04:00
|
|
|
#include "m_ctype.h"
|
2011-01-30 12:41:44 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
We can't use the original DBUG_ASSERT() (which includes _db_flush())
|
|
|
|
in the strings library as libdbug is compiled after the the strings
|
|
|
|
library and we don't want to have strings depending on libdbug which
|
|
|
|
depends on mysys and strings.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#if !defined(DBUG_OFF)
|
|
|
|
#undef DBUG_ASSERT
|
|
|
|
#define DBUG_ASSERT(A) assert(A)
|
|
|
|
#endif
|
2011-10-19 21:45:18 +02:00
|
|
|
|
2016-09-06 12:50:02 +04:00
|
|
|
#define MY_NOPAD_ID(x) ((x)+0x400)
|
|
|
|
|
2011-10-19 21:45:18 +02:00
|
|
|
/* SPACE_INT is a word that contains only spaces */
|
|
|
|
#if SIZEOF_INT == 4
|
|
|
|
#define SPACE_INT 0x20202020
|
|
|
|
#elif SIZEOF_INT == 8
|
|
|
|
#define SPACE_INT 0x2020202020202020
|
|
|
|
#else
|
|
|
|
#error define the appropriate constant for a word full of spaces
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
|
|
Skip trailing space.
|
|
|
|
|
|
|
|
On most systems reading memory in larger chunks (ideally equal to the size of
|
|
|
|
the chinks that the machine physically reads from memory) causes fewer memory
|
|
|
|
access loops and hence increased performance.
|
|
|
|
This is why the 'int' type is used : it's closest to that (according to how
|
|
|
|
it's defined in C).
|
|
|
|
So when we determine the amount of whitespace at the end of a string we do
|
|
|
|
the following :
|
|
|
|
1. We divide the string into 3 zones :
|
|
|
|
a) from the start of the string (__start) to the first multiple
|
|
|
|
of sizeof(int) (__start_words)
|
|
|
|
b) from the end of the string (__end) to the last multiple of sizeof(int)
|
|
|
|
(__end_words)
|
|
|
|
c) a zone that is aligned to sizeof(int) and can be safely accessed
|
|
|
|
through an int *
|
|
|
|
2. We start comparing backwards from (c) char-by-char. If all we find is
|
|
|
|
space then we continue
|
|
|
|
3. If there are elements in zone (b) we compare them as unsigned ints to a
|
|
|
|
int mask (SPACE_INT) consisting of all spaces
|
|
|
|
4. Finally we compare the remaining part (a) of the string char by char.
|
|
|
|
This covers for the last non-space unsigned int from 3. (if any)
|
|
|
|
|
|
|
|
This algorithm works well for relatively larger strings, but it will slow
|
|
|
|
the things down for smaller strings (because of the additional calculations
|
|
|
|
and checks compared to the naive method). Thus the barrier of length 20
|
|
|
|
is added.
|
|
|
|
|
|
|
|
@param ptr pointer to the input string
|
|
|
|
@param len the length of the string
|
|
|
|
@return the last non-space character
|
|
|
|
*/
|
|
|
|
|
|
|
|
static inline const uchar *skip_trailing_space(const uchar *ptr,size_t len)
|
|
|
|
{
|
|
|
|
const uchar *end= ptr + len;
|
2025-02-03 15:00:35 +04:00
|
|
|
DBUG_ASSERT(ptr); /* Avoid UBSAN nullptr-with-offset */
|
2011-10-19 21:45:18 +02:00
|
|
|
if (len > 20)
|
|
|
|
{
|
|
|
|
const uchar *end_words= (const uchar *)(intptr)
|
|
|
|
(((ulonglong)(intptr)end) / SIZEOF_INT * SIZEOF_INT);
|
|
|
|
const uchar *start_words= (const uchar *)(intptr)
|
|
|
|
((((ulonglong)(intptr)ptr) + SIZEOF_INT - 1) / SIZEOF_INT * SIZEOF_INT);
|
|
|
|
|
|
|
|
DBUG_ASSERT(((ulonglong)(intptr)ptr) >= SIZEOF_INT);
|
|
|
|
if (end_words > ptr)
|
|
|
|
{
|
|
|
|
while (end > end_words && end[-1] == 0x20)
|
|
|
|
end--;
|
|
|
|
if (end[-1] == 0x20 && start_words < end_words)
|
|
|
|
while (end > start_words && ((unsigned *)end)[-1] == SPACE_INT)
|
|
|
|
end -= SIZEOF_INT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (end > ptr && end[-1] == 0x20)
|
|
|
|
end--;
|
|
|
|
return (end);
|
|
|
|
}
|
2014-09-11 22:42:35 +03:00
|
|
|
|
2016-09-03 09:05:56 +04:00
|
|
|
|
2024-08-17 12:56:28 +04:00
|
|
|
static inline my_strnxfrm_ret_t
|
|
|
|
my_strnxfrm_ret_construct(size_t output_length,
|
|
|
|
size_t source_length_used,
|
|
|
|
uint warnings)
|
|
|
|
{
|
|
|
|
my_strnxfrm_ret_t rc= {output_length,
|
|
|
|
source_length_used,
|
|
|
|
warnings};
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline my_strnxfrm_pad_ret_t
|
|
|
|
my_strnxfrm_pad_ret_construct(size_t output_length,
|
|
|
|
uint warnings)
|
|
|
|
{
|
|
|
|
my_strnxfrm_pad_ret_t rc= {output_length,
|
|
|
|
warnings};
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
my_strnxfrm_ret_join_pad(my_strnxfrm_ret_t *rc,
|
|
|
|
const my_strnxfrm_pad_ret_t *rcpad)
|
|
|
|
{
|
|
|
|
rc->m_result_length+= rcpad->m_result_length;
|
|
|
|
rc->m_warnings|= rcpad->m_warnings;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2021-09-29 15:13:57 +04:00
|
|
|
int my_strnncollsp_nchars_generic(CHARSET_INFO *cs,
|
|
|
|
const uchar *str1, size_t len1,
|
|
|
|
const uchar *str2, size_t len2,
|
2023-03-31 17:20:03 +04:00
|
|
|
size_t nchars,
|
|
|
|
uint flags);
|
2021-09-29 15:13:57 +04:00
|
|
|
|
|
|
|
int my_strnncollsp_nchars_generic_8bit(CHARSET_INFO *cs,
|
|
|
|
const uchar *str1, size_t len1,
|
|
|
|
const uchar *str2, size_t len2,
|
2023-03-31 17:20:03 +04:00
|
|
|
size_t nchars,
|
|
|
|
uint flags);
|
2021-09-29 15:13:57 +04:00
|
|
|
|
2024-08-17 12:56:28 +04:00
|
|
|
|
|
|
|
size_t my_strnxfrmlen_simple(CHARSET_INFO *, size_t);
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strnxfrm_simple(CHARSET_INFO *,
|
|
|
|
uchar *dst, size_t dstlen, uint nweights,
|
|
|
|
const uchar *src, size_t srclen, uint flags);
|
|
|
|
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strnxfrm_mb(CHARSET_INFO *,
|
|
|
|
uchar *dst, size_t dstlen, uint nweights,
|
|
|
|
const uchar *src, size_t srclen, uint flags);
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strnxfrm_mb_nopad(CHARSET_INFO *,
|
|
|
|
uchar *dst, size_t dstlen, uint nweights,
|
|
|
|
const uchar *src, size_t srclen, uint flags);
|
|
|
|
|
|
|
|
size_t my_strnxfrmlen_unicode(CHARSET_INFO *, size_t);
|
|
|
|
|
|
|
|
size_t my_strnxfrmlen_unicode_full_bin(CHARSET_INFO *, size_t);
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strnxfrm_unicode_full_bin(CHARSET_INFO *,
|
|
|
|
uchar *dst, size_t dstlen, uint nweights,
|
|
|
|
const uchar *src, size_t srclen, uint flags);
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strnxfrm_unicode_full_nopad_bin(CHARSET_INFO *,
|
|
|
|
uchar *dst, size_t dstlen, uint nweights,
|
|
|
|
const uchar *src, size_t srclen,
|
|
|
|
uint flags);
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strxfrm_pad_desc_and_reverse(CHARSET_INFO *cs,
|
|
|
|
uchar *str, uchar *frmend, uchar *strend,
|
|
|
|
uint nweights, uint flags, uint level);
|
|
|
|
|
|
|
|
my_strnxfrm_ret_t
|
|
|
|
my_strxfrm_pad_desc_and_reverse_nopad(CHARSET_INFO *cs,
|
|
|
|
uchar *str, uchar *frmend,
|
|
|
|
uchar *strend, uint nweights,
|
|
|
|
uint flags, uint level);
|
|
|
|
|
2016-09-03 09:05:56 +04:00
|
|
|
uint my_8bit_charset_flags_from_data(CHARSET_INFO *cs);
|
|
|
|
uint my_8bit_collation_flags_from_data(CHARSET_INFO *cs);
|
|
|
|
|
|
|
|
|
2014-09-11 22:42:35 +03:00
|
|
|
/* Macros for hashing characters */
|
|
|
|
|
|
|
|
#define MY_HASH_ADD(A, B, value) \
|
|
|
|
do { A^= (((A & 63)+B)*((value)))+ (A << 8); B+=3; } while(0)
|
|
|
|
|
|
|
|
#define MY_HASH_ADD_16(A, B, value) \
|
|
|
|
do { MY_HASH_ADD(A, B, ((value) & 0xFF)) ; MY_HASH_ADD(A, B, ((value >>8 ))); } while(0)
|
|
|
|
|
2020-05-07 19:20:17 +04:00
|
|
|
|
|
|
|
#define my_wc_t ulong
|
|
|
|
|
|
|
|
int my_wc_to_printable_ex(CHARSET_INFO *cs, my_wc_t wc,
|
|
|
|
uchar *s, uchar *e,
|
|
|
|
uint bs, uint bslen, uint diglen);
|
|
|
|
|
|
|
|
int my_wc_to_printable_generic(CHARSET_INFO *cs, my_wc_t wc,
|
|
|
|
uchar *s, uchar *e);
|
|
|
|
|
|
|
|
int my_wc_to_printable_8bit(CHARSET_INFO *cs, my_wc_t wc,
|
|
|
|
uchar *s, uchar *e);
|
|
|
|
|
MDEV-27009 Add UCA-14.0.0 collations
- Added one neutral and 22 tailored (language specific) collations based on
Unicode Collation Algorithm version 14.0.0.
Collations were added for Unicode character sets
utf8mb3, utf8mb4, ucs2, utf16, utf32.
Every tailoring was added with four accent and case
sensitivity flag combinations, e.g:
* utf8mb4_uca1400_swedish_as_cs
* utf8mb4_uca1400_swedish_as_ci
* utf8mb4_uca1400_swedish_ai_cs
* utf8mb4_uca1400_swedish_ai_ci
and their _nopad_ variants:
* utf8mb4_uca1400_swedish_nopad_as_cs
* utf8mb4_uca1400_swedish_nopad_as_ci
* utf8mb4_uca1400_swedish_nopad_ai_cs
* utf8mb4_uca1400_swedish_nopad_ai_ci
- Introducing a conception of contextually typed named collations:
CREATE DATABASE db1 CHARACTER SET utf8mb4;
CREATE TABLE db1.t1 (a CHAR(10) COLLATE uca1400_as_ci);
The idea is that there is no a need to specify the character set prefix
in the new collation names. It's enough to type just the suffix
"uca1400_as_ci". The character set is taken from the context.
In the above example script the context character set is utf8mb4.
So the CREATE TABLE will make a column with the collation
utf8mb4_uca1400_as_ci.
Short collations names can be used in any parts of the SQL syntax
where the COLLATE clause is understood.
- New collations are displayed only one time
(without character set combinations) by these statements:
SELECT * FROM INFORMATION_SCHEMA.COLLATIONS;
SHOW COLLATION;
For example, all these collations:
- utf8mb3_uca1400_swedish_as_ci
- utf8mb4_uca1400_swedish_as_ci
- ucs2_uca1400_swedish_as_ci
- utf16_uca1400_swedish_as_ci
- utf32_uca1400_swedish_as_ci
have just one entry in INFORMATION_SCHEMA.COLLATIONS and SHOW COLLATION,
with COLLATION_NAME equal to "uca1400_swedish_as_ci", which is the suffix
without the character set name:
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS
WHERE COLLATION_NAME LIKE '%uca1400_swedish_as_ci';
+-----------------------+
| COLLATION_NAME |
+-----------------------+
| uca1400_swedish_as_ci |
+-----------------------+
Note, the behaviour of old collations did not change.
Non-unicode collations (e.g. latin1_swedish_ci) and
old UCA-4.0.0 collations (e.g. utf8mb4_unicode_ci)
are still displayed with the character set prefix, as before.
- The structure of the table INFORMATION_SCHEMA.COLLATIONS was changed.
The NOT NULL constraint was removed from these columns:
- CHARACTER_SET_NAME
- ID
- IS_DEFAULT
and from the corresponding columns in SHOW COLLATION.
For example:
SELECT COLLATION_NAME, CHARACTER_SET_NAME, ID, IS_DEFAULT
FROM INFORMATION_SCHEMA.COLLATIONS
WHERE COLLATION_NAME LIKE '%uca1400_swedish_as_ci';
+-----------------------+--------------------+------+------------+
| COLLATION_NAME | CHARACTER_SET_NAME | ID | IS_DEFAULT |
+-----------------------+--------------------+------+------------+
| uca1400_swedish_as_ci | NULL | NULL | NULL |
+-----------------------+--------------------+------+------------+
The NULL value in these columns now means that the collation
is applicable to multiple character sets.
The behavioir of old collations did not change.
Make sure your client programs can handle NULL values in these columns.
- The structure of the table
INFORMATION_SCHEMA.COLLATION_CHARACTER_SET_APPLICABILITY was changed.
Three new NOT NULL columns were added:
- FULL_COLLATION_NAME
- ID
- IS_DEFAULT
New collations have multiple entries in COLLATION_CHARACTER_SET_APPLICABILITY.
The column COLLATION_NAME contains the collation name without the character
set prefix. The column FULL_COLLATION_NAME contains the collation name with
the character set prefix.
Old collations have full collation name in both FULL_COLLATION_NAME and
COLLATION_NAME.
SELECT COLLATION_NAME, FULL_COLLATION_NAME, CHARACTER_SET_NAME, ID, IS_DEFAULT
FROM INFORMATION_SCHEMA.COLLATION_CHARACTER_SET_APPLICABILITY
WHERE FULL_COLLATION_NAME RLIKE '^(utf8mb4|latin1).*swedish.*ci$';
+-----------------------------+-------------------------------------+--------------------+------+------------+
| COLLATION_NAME | FULL_COLLATION_NAME | CHARACTER_SET_NAME | ID | IS_DEFAULT |
+-----------------------------+-------------------------------------+--------------------+------+------------+
| latin1_swedish_ci | latin1_swedish_ci | latin1 | 8 | Yes |
| latin1_swedish_nopad_ci | latin1_swedish_nopad_ci | latin1 | 1032 | |
| utf8mb4_swedish_ci | utf8mb4_swedish_ci | utf8mb4 | 232 | |
| uca1400_swedish_ai_ci | utf8mb4_uca1400_swedish_ai_ci | utf8mb4 | 2368 | |
| uca1400_swedish_as_ci | utf8mb4_uca1400_swedish_as_ci | utf8mb4 | 2370 | |
| uca1400_swedish_nopad_ai_ci | utf8mb4_uca1400_swedish_nopad_ai_ci | utf8mb4 | 2372 | |
| uca1400_swedish_nopad_as_ci | utf8mb4_uca1400_swedish_nopad_as_ci | utf8mb4 | 2374 | |
+-----------------------------+-------------------------------------+--------------------+------+------------+
- Other INFORMATION_SCHEMA queries:
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLUMNS;
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.PARAMETERS;
SELECT TABLE_COLLATION FROM INFORMATION_SCHEMA.TABLES;
SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA;
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.ROUTINES;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.EVENTS;
SELECT DATABASE_COLLATION FROM INFORMATION_SCHEMA.EVENTS;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.ROUTINES;
SELECT DATABASE_COLLATION FROM INFORMATION_SCHEMA.ROUTINES;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.TRIGGERS;
SELECT DATABASE_COLLATION FROM INFORMATION_SCHEMA.TRIGGERS;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.VIEWS;
display full collation names, including character sets prefix,
for all collations, including new collations.
Corresponding SHOW commands also display full collation names
in collation related columns:
SHOW CREATE TABLE t1;
SHOW CREATE DATABASE db1;
SHOW TABLE STATUS;
SHOW CREATE FUNCTION f1;
SHOW CREATE PROCEDURE p1;
SHOW CREATE EVENT ev1;
SHOW CREATE TRIGGER tr1;
SHOW CREATE VIEW;
These INFORMATION_SCHEMA queries and SHOW statements may change in
the future, to display show collation names.
2021-11-28 16:55:15 +04:00
|
|
|
void my_ci_set_strength(struct charset_info_st *cs, uint strength);
|
|
|
|
void my_ci_set_level_flags(struct charset_info_st *cs, uint flags);
|
|
|
|
|
2023-02-17 16:20:01 +04:00
|
|
|
uint my_casefold_multiply_1(CHARSET_INFO *cs);
|
|
|
|
uint my_casefold_multiply_2(CHARSET_INFO *cs);
|
|
|
|
|
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.
2025-03-22 12:45:13 +04:00
|
|
|
my_bool my_ci_eq_collation_generic(CHARSET_INFO *self, CHARSET_INFO *other);
|
|
|
|
|
|
|
|
struct charset_info_st *my_ci_alloc(MY_CHARSET_LOADER *loader,
|
|
|
|
const LEX_CSTRING name,
|
|
|
|
LEX_CSTRING *out_name,
|
|
|
|
const LEX_CSTRING comment,
|
|
|
|
LEX_CSTRING *out_comment);
|
MDEV-27009 Add UCA-14.0.0 collations
- Added one neutral and 22 tailored (language specific) collations based on
Unicode Collation Algorithm version 14.0.0.
Collations were added for Unicode character sets
utf8mb3, utf8mb4, ucs2, utf16, utf32.
Every tailoring was added with four accent and case
sensitivity flag combinations, e.g:
* utf8mb4_uca1400_swedish_as_cs
* utf8mb4_uca1400_swedish_as_ci
* utf8mb4_uca1400_swedish_ai_cs
* utf8mb4_uca1400_swedish_ai_ci
and their _nopad_ variants:
* utf8mb4_uca1400_swedish_nopad_as_cs
* utf8mb4_uca1400_swedish_nopad_as_ci
* utf8mb4_uca1400_swedish_nopad_ai_cs
* utf8mb4_uca1400_swedish_nopad_ai_ci
- Introducing a conception of contextually typed named collations:
CREATE DATABASE db1 CHARACTER SET utf8mb4;
CREATE TABLE db1.t1 (a CHAR(10) COLLATE uca1400_as_ci);
The idea is that there is no a need to specify the character set prefix
in the new collation names. It's enough to type just the suffix
"uca1400_as_ci". The character set is taken from the context.
In the above example script the context character set is utf8mb4.
So the CREATE TABLE will make a column with the collation
utf8mb4_uca1400_as_ci.
Short collations names can be used in any parts of the SQL syntax
where the COLLATE clause is understood.
- New collations are displayed only one time
(without character set combinations) by these statements:
SELECT * FROM INFORMATION_SCHEMA.COLLATIONS;
SHOW COLLATION;
For example, all these collations:
- utf8mb3_uca1400_swedish_as_ci
- utf8mb4_uca1400_swedish_as_ci
- ucs2_uca1400_swedish_as_ci
- utf16_uca1400_swedish_as_ci
- utf32_uca1400_swedish_as_ci
have just one entry in INFORMATION_SCHEMA.COLLATIONS and SHOW COLLATION,
with COLLATION_NAME equal to "uca1400_swedish_as_ci", which is the suffix
without the character set name:
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLLATIONS
WHERE COLLATION_NAME LIKE '%uca1400_swedish_as_ci';
+-----------------------+
| COLLATION_NAME |
+-----------------------+
| uca1400_swedish_as_ci |
+-----------------------+
Note, the behaviour of old collations did not change.
Non-unicode collations (e.g. latin1_swedish_ci) and
old UCA-4.0.0 collations (e.g. utf8mb4_unicode_ci)
are still displayed with the character set prefix, as before.
- The structure of the table INFORMATION_SCHEMA.COLLATIONS was changed.
The NOT NULL constraint was removed from these columns:
- CHARACTER_SET_NAME
- ID
- IS_DEFAULT
and from the corresponding columns in SHOW COLLATION.
For example:
SELECT COLLATION_NAME, CHARACTER_SET_NAME, ID, IS_DEFAULT
FROM INFORMATION_SCHEMA.COLLATIONS
WHERE COLLATION_NAME LIKE '%uca1400_swedish_as_ci';
+-----------------------+--------------------+------+------------+
| COLLATION_NAME | CHARACTER_SET_NAME | ID | IS_DEFAULT |
+-----------------------+--------------------+------+------------+
| uca1400_swedish_as_ci | NULL | NULL | NULL |
+-----------------------+--------------------+------+------------+
The NULL value in these columns now means that the collation
is applicable to multiple character sets.
The behavioir of old collations did not change.
Make sure your client programs can handle NULL values in these columns.
- The structure of the table
INFORMATION_SCHEMA.COLLATION_CHARACTER_SET_APPLICABILITY was changed.
Three new NOT NULL columns were added:
- FULL_COLLATION_NAME
- ID
- IS_DEFAULT
New collations have multiple entries in COLLATION_CHARACTER_SET_APPLICABILITY.
The column COLLATION_NAME contains the collation name without the character
set prefix. The column FULL_COLLATION_NAME contains the collation name with
the character set prefix.
Old collations have full collation name in both FULL_COLLATION_NAME and
COLLATION_NAME.
SELECT COLLATION_NAME, FULL_COLLATION_NAME, CHARACTER_SET_NAME, ID, IS_DEFAULT
FROM INFORMATION_SCHEMA.COLLATION_CHARACTER_SET_APPLICABILITY
WHERE FULL_COLLATION_NAME RLIKE '^(utf8mb4|latin1).*swedish.*ci$';
+-----------------------------+-------------------------------------+--------------------+------+------------+
| COLLATION_NAME | FULL_COLLATION_NAME | CHARACTER_SET_NAME | ID | IS_DEFAULT |
+-----------------------------+-------------------------------------+--------------------+------+------------+
| latin1_swedish_ci | latin1_swedish_ci | latin1 | 8 | Yes |
| latin1_swedish_nopad_ci | latin1_swedish_nopad_ci | latin1 | 1032 | |
| utf8mb4_swedish_ci | utf8mb4_swedish_ci | utf8mb4 | 232 | |
| uca1400_swedish_ai_ci | utf8mb4_uca1400_swedish_ai_ci | utf8mb4 | 2368 | |
| uca1400_swedish_as_ci | utf8mb4_uca1400_swedish_as_ci | utf8mb4 | 2370 | |
| uca1400_swedish_nopad_ai_ci | utf8mb4_uca1400_swedish_nopad_ai_ci | utf8mb4 | 2372 | |
| uca1400_swedish_nopad_as_ci | utf8mb4_uca1400_swedish_nopad_as_ci | utf8mb4 | 2374 | |
+-----------------------------+-------------------------------------+--------------------+------+------------+
- Other INFORMATION_SCHEMA queries:
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.COLUMNS;
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.PARAMETERS;
SELECT TABLE_COLLATION FROM INFORMATION_SCHEMA.TABLES;
SELECT DEFAULT_COLLATION_NAME FROM INFORMATION_SCHEMA.SCHEMATA;
SELECT COLLATION_NAME FROM INFORMATION_SCHEMA.ROUTINES;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.EVENTS;
SELECT DATABASE_COLLATION FROM INFORMATION_SCHEMA.EVENTS;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.ROUTINES;
SELECT DATABASE_COLLATION FROM INFORMATION_SCHEMA.ROUTINES;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.TRIGGERS;
SELECT DATABASE_COLLATION FROM INFORMATION_SCHEMA.TRIGGERS;
SELECT COLLATION_CONNECTION FROM INFORMATION_SCHEMA.VIEWS;
display full collation names, including character sets prefix,
for all collations, including new collations.
Corresponding SHOW commands also display full collation names
in collation related columns:
SHOW CREATE TABLE t1;
SHOW CREATE DATABASE db1;
SHOW TABLE STATUS;
SHOW CREATE FUNCTION f1;
SHOW CREATE PROCEDURE p1;
SHOW CREATE EVENT ev1;
SHOW CREATE TRIGGER tr1;
SHOW CREATE VIEW;
These INFORMATION_SCHEMA queries and SHOW statements may change in
the future, to display show collation names.
2021-11-28 16:55:15 +04:00
|
|
|
|
2020-07-20 19:26:31 +03:00
|
|
|
/* Some common character set names */
|
|
|
|
extern const char charset_name_latin2[];
|
2020-08-22 02:08:59 +03:00
|
|
|
#define charset_name_latin2_length 6
|
2021-02-15 01:39:37 +05:30
|
|
|
extern const char charset_name_utf8mb3[];
|
2020-08-22 02:08:59 +03:00
|
|
|
#define charset_name_utf8mb3_length 7
|
2020-07-20 19:26:31 +03:00
|
|
|
extern const char charset_name_utf16[];
|
2020-08-22 02:08:59 +03:00
|
|
|
#define charset_name_utf16_length 5
|
2020-07-20 19:26:31 +03:00
|
|
|
extern const char charset_name_utf32[];
|
2020-08-22 02:08:59 +03:00
|
|
|
#define charset_name_utf32_length 5
|
2020-07-20 19:26:31 +03:00
|
|
|
extern const char charset_name_ucs2[];
|
2020-08-22 02:08:59 +03:00
|
|
|
#define charset_name_ucs2_length 4
|
2020-07-20 19:26:31 +03:00
|
|
|
extern const char charset_name_utf8mb4[];
|
2020-08-22 02:08:59 +03:00
|
|
|
#define charset_name_utf8mb4_length 7
|
2020-07-20 19:26:31 +03:00
|
|
|
|
2020-05-07 19:20:17 +04:00
|
|
|
#endif /*STRINGS_DEF_INCLUDED */
|