Skip to content

Commit 83f688b

Browse files
author
Tor Didriksen
committed
Bug #34025412 Rename utf8_xxx functions and data structures to utf8mb3_xxx [noclose]
For better code readability/maintainability, rename functions and data structures used for handling utf8mb3 charsets and collations. This patch renames my_charset_utf8_xxx to my_charset_utf8mb3_xxx. Change-Id: I7f198007b365e780e814f8b5b9ddbfdf06a50c67
1 parent b67d9ed commit 83f688b

File tree

83 files changed

+345
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+345
-338
lines changed

‎include/m_ctype.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,10 @@ extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8mb4_0900_bin;
417417

418418
extern CHARSET_INFO my_charset_latin1_bin;
419419
extern CHARSET_INFO my_charset_utf32_unicode_ci;
420-
extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8_general_ci;
421-
extern CHARSET_INFO my_charset_utf8_tolower_ci;
422-
extern CHARSET_INFO my_charset_utf8_unicode_ci;
423-
extern CHARSET_INFO my_charset_utf8_bin;
420+
extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8mb3_general_ci;
421+
extern CHARSET_INFO my_charset_utf8mb3_tolower_ci;
422+
extern CHARSET_INFO my_charset_utf8mb3_unicode_ci;
423+
extern CHARSET_INFO my_charset_utf8mb3_bin;
424424
extern CHARSET_INFO my_charset_utf8mb4_bin;
425425
extern MYSQL_PLUGIN_IMPORT CHARSET_INFO my_charset_utf8mb4_general_ci;
426426

‎mysys/charset-def.cc

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -148,32 +148,32 @@ extern CHARSET_INFO my_charset_utf16_sinhala_uca_ci;
148148
extern CHARSET_INFO my_charset_utf16_unicode_520_ci;
149149
extern CHARSET_INFO my_charset_utf16_vietnamese_ci;
150150

151-
extern CHARSET_INFO my_charset_utf8_tolower_ci;
152-
extern CHARSET_INFO my_charset_utf8_bin;
153-
extern CHARSET_INFO my_charset_utf8_general_mysql500_ci;
154-
extern CHARSET_INFO my_charset_utf8_german2_uca_ci;
155-
extern CHARSET_INFO my_charset_utf8_icelandic_uca_ci;
156-
extern CHARSET_INFO my_charset_utf8_latvian_uca_ci;
157-
extern CHARSET_INFO my_charset_utf8_romanian_uca_ci;
158-
extern CHARSET_INFO my_charset_utf8_slovenian_uca_ci;
159-
extern CHARSET_INFO my_charset_utf8_polish_uca_ci;
160-
extern CHARSET_INFO my_charset_utf8_estonian_uca_ci;
161-
extern CHARSET_INFO my_charset_utf8_spanish_uca_ci;
162-
extern CHARSET_INFO my_charset_utf8_swedish_uca_ci;
163-
extern CHARSET_INFO my_charset_utf8_turkish_uca_ci;
164-
extern CHARSET_INFO my_charset_utf8_czech_uca_ci;
165-
extern CHARSET_INFO my_charset_utf8_danish_uca_ci;
166-
extern CHARSET_INFO my_charset_utf8_lithuanian_uca_ci;
167-
extern CHARSET_INFO my_charset_utf8_slovak_uca_ci;
168-
extern CHARSET_INFO my_charset_utf8_spanish2_uca_ci;
169-
extern CHARSET_INFO my_charset_utf8_roman_uca_ci;
170-
extern CHARSET_INFO my_charset_utf8_persian_uca_ci;
171-
extern CHARSET_INFO my_charset_utf8_esperanto_uca_ci;
172-
extern CHARSET_INFO my_charset_utf8_hungarian_uca_ci;
173-
extern CHARSET_INFO my_charset_utf8_croatian_uca_ci;
174-
extern CHARSET_INFO my_charset_utf8_sinhala_uca_ci;
175-
extern CHARSET_INFO my_charset_utf8_unicode_520_ci;
176-
extern CHARSET_INFO my_charset_utf8_vietnamese_ci;
151+
extern CHARSET_INFO my_charset_utf8mb3_tolower_ci;
152+
extern CHARSET_INFO my_charset_utf8mb3_bin;
153+
extern CHARSET_INFO my_charset_utf8mb3_general_mysql500_ci;
154+
extern CHARSET_INFO my_charset_utf8mb3_german2_uca_ci;
155+
extern CHARSET_INFO my_charset_utf8mb3_icelandic_uca_ci;
156+
extern CHARSET_INFO my_charset_utf8mb3_latvian_uca_ci;
157+
extern CHARSET_INFO my_charset_utf8mb3_romanian_uca_ci;
158+
extern CHARSET_INFO my_charset_utf8mb3_slovenian_uca_ci;
159+
extern CHARSET_INFO my_charset_utf8mb3_polish_uca_ci;
160+
extern CHARSET_INFO my_charset_utf8mb3_estonian_uca_ci;
161+
extern CHARSET_INFO my_charset_utf8mb3_spanish_uca_ci;
162+
extern CHARSET_INFO my_charset_utf8mb3_swedish_uca_ci;
163+
extern CHARSET_INFO my_charset_utf8mb3_turkish_uca_ci;
164+
extern CHARSET_INFO my_charset_utf8mb3_czech_uca_ci;
165+
extern CHARSET_INFO my_charset_utf8mb3_danish_uca_ci;
166+
extern CHARSET_INFO my_charset_utf8mb3_lithuanian_uca_ci;
167+
extern CHARSET_INFO my_charset_utf8mb3_slovak_uca_ci;
168+
extern CHARSET_INFO my_charset_utf8mb3_spanish2_uca_ci;
169+
extern CHARSET_INFO my_charset_utf8mb3_roman_uca_ci;
170+
extern CHARSET_INFO my_charset_utf8mb3_persian_uca_ci;
171+
extern CHARSET_INFO my_charset_utf8mb3_esperanto_uca_ci;
172+
extern CHARSET_INFO my_charset_utf8mb3_hungarian_uca_ci;
173+
extern CHARSET_INFO my_charset_utf8mb3_croatian_uca_ci;
174+
extern CHARSET_INFO my_charset_utf8mb3_sinhala_uca_ci;
175+
extern CHARSET_INFO my_charset_utf8mb3_unicode_520_ci;
176+
extern CHARSET_INFO my_charset_utf8mb3_vietnamese_ci;
177177

178178
extern CHARSET_INFO my_charset_utf8mb4_general_ci;
179179
extern CHARSET_INFO my_charset_utf8mb4_unicode_ci;
@@ -339,34 +339,34 @@ bool init_compiled_charsets(myf flags [[maybe_unused]]) {
339339
add_compiled_collation(&my_charset_ujis_japanese_ci);
340340
add_compiled_collation(&my_charset_ujis_bin);
341341

342-
add_compiled_collation(&my_charset_utf8_general_ci);
343-
add_compiled_collation(&my_charset_utf8_tolower_ci);
344-
add_compiled_collation(&my_charset_utf8_bin);
345-
add_compiled_collation(&my_charset_utf8_general_mysql500_ci);
346-
add_compiled_collation(&my_charset_utf8_unicode_ci);
347-
add_compiled_collation(&my_charset_utf8_german2_uca_ci);
348-
add_compiled_collation(&my_charset_utf8_icelandic_uca_ci);
349-
add_compiled_collation(&my_charset_utf8_latvian_uca_ci);
350-
add_compiled_collation(&my_charset_utf8_romanian_uca_ci);
351-
add_compiled_collation(&my_charset_utf8_slovenian_uca_ci);
352-
add_compiled_collation(&my_charset_utf8_polish_uca_ci);
353-
add_compiled_collation(&my_charset_utf8_estonian_uca_ci);
354-
add_compiled_collation(&my_charset_utf8_spanish_uca_ci);
355-
add_compiled_collation(&my_charset_utf8_swedish_uca_ci);
356-
add_compiled_collation(&my_charset_utf8_turkish_uca_ci);
357-
add_compiled_collation(&my_charset_utf8_czech_uca_ci);
358-
add_compiled_collation(&my_charset_utf8_danish_uca_ci);
359-
add_compiled_collation(&my_charset_utf8_lithuanian_uca_ci);
360-
add_compiled_collation(&my_charset_utf8_slovak_uca_ci);
361-
add_compiled_collation(&my_charset_utf8_spanish2_uca_ci);
362-
add_compiled_collation(&my_charset_utf8_roman_uca_ci);
363-
add_compiled_collation(&my_charset_utf8_persian_uca_ci);
364-
add_compiled_collation(&my_charset_utf8_esperanto_uca_ci);
365-
add_compiled_collation(&my_charset_utf8_hungarian_uca_ci);
366-
add_compiled_collation(&my_charset_utf8_croatian_uca_ci);
367-
add_compiled_collation(&my_charset_utf8_sinhala_uca_ci);
368-
add_compiled_collation(&my_charset_utf8_unicode_520_ci);
369-
add_compiled_collation(&my_charset_utf8_vietnamese_ci);
342+
add_compiled_collation(&my_charset_utf8mb3_general_ci);
343+
add_compiled_collation(&my_charset_utf8mb3_tolower_ci);
344+
add_compiled_collation(&my_charset_utf8mb3_bin);
345+
add_compiled_collation(&my_charset_utf8mb3_general_mysql500_ci);
346+
add_compiled_collation(&my_charset_utf8mb3_unicode_ci);
347+
add_compiled_collation(&my_charset_utf8mb3_german2_uca_ci);
348+
add_compiled_collation(&my_charset_utf8mb3_icelandic_uca_ci);
349+
add_compiled_collation(&my_charset_utf8mb3_latvian_uca_ci);
350+
add_compiled_collation(&my_charset_utf8mb3_romanian_uca_ci);
351+
add_compiled_collation(&my_charset_utf8mb3_slovenian_uca_ci);
352+
add_compiled_collation(&my_charset_utf8mb3_polish_uca_ci);
353+
add_compiled_collation(&my_charset_utf8mb3_estonian_uca_ci);
354+
add_compiled_collation(&my_charset_utf8mb3_spanish_uca_ci);
355+
add_compiled_collation(&my_charset_utf8mb3_swedish_uca_ci);
356+
add_compiled_collation(&my_charset_utf8mb3_turkish_uca_ci);
357+
add_compiled_collation(&my_charset_utf8mb3_czech_uca_ci);
358+
add_compiled_collation(&my_charset_utf8mb3_danish_uca_ci);
359+
add_compiled_collation(&my_charset_utf8mb3_lithuanian_uca_ci);
360+
add_compiled_collation(&my_charset_utf8mb3_slovak_uca_ci);
361+
add_compiled_collation(&my_charset_utf8mb3_spanish2_uca_ci);
362+
add_compiled_collation(&my_charset_utf8mb3_roman_uca_ci);
363+
add_compiled_collation(&my_charset_utf8mb3_persian_uca_ci);
364+
add_compiled_collation(&my_charset_utf8mb3_esperanto_uca_ci);
365+
add_compiled_collation(&my_charset_utf8mb3_hungarian_uca_ci);
366+
add_compiled_collation(&my_charset_utf8mb3_croatian_uca_ci);
367+
add_compiled_collation(&my_charset_utf8mb3_sinhala_uca_ci);
368+
add_compiled_collation(&my_charset_utf8mb3_unicode_520_ci);
369+
add_compiled_collation(&my_charset_utf8mb3_vietnamese_ci);
370370

371371
// utf8mb4 is the only character set with more than two binary collations. For
372372
// backward compatibility, we want the deprecated BINARY type attribute to use

‎mysys/charset.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ static int add_collation(CHARSET_INFO *cs) {
256256
newcs->state |= MY_CS_AVAILABLE | MY_CS_LOADED | MY_CS_NONASCII;
257257
} else if (!strcmp(cs->csname, "utf8") ||
258258
!strcmp(cs->csname, "utf8mb3")) {
259-
copy_uca_collation(newcs, &my_charset_utf8_unicode_ci);
260-
newcs->ctype = my_charset_utf8_unicode_ci.ctype;
259+
copy_uca_collation(newcs, &my_charset_utf8mb3_unicode_ci);
260+
newcs->ctype = my_charset_utf8mb3_unicode_ci.ctype;
261261
if (init_state_maps(newcs)) return MY_XML_ERROR;
262262
} else if (!strcmp(cs->csname, "utf8mb4")) {
263263
copy_uca_collation(newcs, &my_charset_utf8mb4_unicode_ci);

‎plugin/group_replication/include/sql_service/sql_service_interface.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class Sql_service_interface {
101101
*/
102102
Sql_service_interface(
103103
enum cs_text_or_binary cs_txt_bin = CS_TEXT_REPRESENTATION,
104-
const CHARSET_INFO *cs_charset = &my_charset_utf8_general_ci);
104+
const CHARSET_INFO *cs_charset = &my_charset_utf8mb3_general_ci);
105105

106106
/**
107107
Sql_service_interface destructor
@@ -162,7 +162,7 @@ class Sql_service_interface {
162162
long execute_query(
163163
std::string sql_string, Sql_resultset *rset,
164164
enum cs_text_or_binary cs_txt_bin = CS_TEXT_REPRESENTATION,
165-
const CHARSET_INFO *cs_charset = &my_charset_utf8_general_ci);
165+
const CHARSET_INFO *cs_charset = &my_charset_utf8mb3_general_ci);
166166

167167
/**
168168
Executes a server command in a session.
@@ -185,7 +185,7 @@ class Sql_service_interface {
185185
long execute(COM_DATA cmd, enum enum_server_command cmd_type,
186186
Sql_resultset *rset,
187187
enum cs_text_or_binary cs_txt_bin = CS_TEXT_REPRESENTATION,
188-
const CHARSET_INFO *cs_charset = &my_charset_utf8_general_ci);
188+
const CHARSET_INFO *cs_charset = &my_charset_utf8mb3_general_ci);
189189

190190
/**
191191
Set send result type to CS_TEXT_REPRESENTATION or

‎plugin/group_replication/src/plugin_utils.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void plugin_escape_string(std::string &string_to_escape) {
100100
size_t length = string_to_escape.length();
101101
char *end_string =
102102
(char *)my_malloc(PSI_NOT_INSTRUMENTED, 2 * length + 1, MYF(0));
103-
escape_string_for_mysql(&my_charset_utf8_general_ci, end_string,
103+
escape_string_for_mysql(&my_charset_utf8mb3_general_ci, end_string,
104104
2 * length + 1, string_to_escape.c_str(), length);
105105
string_to_escape.assign(end_string);
106106
my_free(end_string);

‎plugin/test_service_sql_api/test_session_attach.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd) {
9494

9595
const bool failed =
9696
0 != command_service_run_command(session, COM_QUERY, &cmd,
97-
&my_charset_utf8_general_ci, &sql_cbs,
97+
&my_charset_utf8mb3_general_ci, &sql_cbs,
9898
CS_BINARY_REPRESENTATION, nullptr);
9999

100100
if (failed) {

‎plugin/test_service_sql_api/test_session_detach.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,9 @@ static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
588588
memset(&cmd, 0, sizeof(cmd));
589589
cmd.com_query.query = test_cmd;
590590
cmd.com_query.length = strlen(cmd.com_query.query);
591-
int fail = command_service_run_command(session, COM_QUERY, &cmd,
592-
&my_charset_utf8_general_ci, &sql_cbs,
593-
CS_BINARY_REPRESENTATION, ctx);
591+
int fail = command_service_run_command(
592+
session, COM_QUERY, &cmd, &my_charset_utf8mb3_general_ci, &sql_cbs,
593+
CS_BINARY_REPRESENTATION, ctx);
594594

595595
if (fail)
596596
LogPluginErrMsg(ERROR_LEVEL, ER_LOG_PRINTF_MSG,

‎plugin/test_service_sql_api/test_session_info.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ static void exec_test_cmd(MYSQL_SESSION session, const char *query,
545545
cmd.com_query.length = strlen(cmd.com_query.query);
546546
WRITE_VAL("%s\n", query);
547547
int fail = command_service_run_command(session, COM_QUERY, &cmd,
548-
&my_charset_utf8_general_ci, &sql_cbs,
549-
CS_TEXT_REPRESENTATION, ctx);
548+
&my_charset_utf8mb3_general_ci,
549+
&sql_cbs, CS_TEXT_REPRESENTATION, ctx);
550550
if (fail) {
551551
srv_session_close(session);
552552
if (!expect_error)
@@ -584,9 +584,9 @@ static void test_com_init_db(void *p [[maybe_unused]], MYSQL_SESSION st_session,
584584
cmd.com_init_db.db_name = db_name;
585585
cmd.com_init_db.length = strlen(db_name);
586586

587-
int fail = command_service_run_command(st_session, COM_INIT_DB, &cmd,
588-
&my_charset_utf8_general_ci, &sql_cbs,
589-
CS_TEXT_REPRESENTATION, plugin_ctx);
587+
int fail = command_service_run_command(
588+
st_session, COM_INIT_DB, &cmd, &my_charset_utf8mb3_general_ci, &sql_cbs,
589+
CS_TEXT_REPRESENTATION, plugin_ctx);
590590

591591
if (fail) {
592592
LogPluginErr(ERROR_LEVEL, ER_LOG_PRINTF_MSG, "run_statement code: %d\n",
@@ -931,9 +931,9 @@ static void test_sql(void *p) {
931931
cmd.com_query.query = buffer_query;
932932
cmd.com_query.length = strlen(buffer_query);
933933

934-
int fail = command_service_run_command(session_2, COM_QUERY, &cmd,
935-
&my_charset_utf8_general_ci, &sql_cbs,
936-
CS_TEXT_REPRESENTATION, plugin_ctx);
934+
int fail = command_service_run_command(
935+
session_2, COM_QUERY, &cmd, &my_charset_utf8mb3_general_ci, &sql_cbs,
936+
CS_TEXT_REPRESENTATION, plugin_ctx);
937937

938938
if (fail) {
939939
LogPluginErr(ERROR_LEVEL, ER_LOG_PRINTF_MSG, "run_statement code: %d\n",
@@ -953,7 +953,7 @@ static void test_sql(void *p) {
953953
cmd.com_query.length = strlen(buffer_query);
954954

955955
fail = command_service_run_command(session_2, COM_QUERY, &cmd,
956-
&my_charset_utf8_general_ci, &sql_cbs,
956+
&my_charset_utf8mb3_general_ci, &sql_cbs,
957957
CS_TEXT_REPRESENTATION, plugin_ctx);
958958

959959
if (fail) {

‎plugin/test_service_sql_api/test_sql_2_sessions.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@ static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
641641
cmd.com_query.query = test_cmd;
642642
cmd.com_query.length = strlen(cmd.com_query.query);
643643
int fail = command_service_run_command(session, COM_QUERY, &cmd,
644-
&my_charset_utf8_general_ci, &sql_cbs,
645-
CS_TEXT_REPRESENTATION, ctx);
644+
&my_charset_utf8mb3_general_ci,
645+
&sql_cbs, CS_TEXT_REPRESENTATION, ctx);
646646
if (fail) {
647647
if (!srv_session_close(session))
648648
LogPluginErrMsg(ERROR_LEVEL, ER_LOG_PRINTF_MSG,

‎plugin/test_service_sql_api/test_sql_9_sessions.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
442442
cmd.com_query.query = (char *)test_cmd;
443443
cmd.com_query.length = strlen(cmd.com_query.query);
444444
fail = command_service_run_command(session, select_prot, COM_QUERY, &cmd,
445-
&my_charset_utf8_general_ci);
445+
&my_charset_utf8mb3_general_ci);
446446
if (fail)
447447
LogPluginErrMsg(ERROR_LEVEL, ER_LOG_PRINTF_MSG,
448448
"test_sql_9_sessions - ret code : %d", fail);

‎plugin/test_service_sql_api/test_sql_all_col_types.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,8 @@ static void exec_test_cmd(MYSQL_SESSION session, const char *test_cmd,
775775
cmd.com_query.query = test_cmd;
776776
cmd.com_query.length = strlen(cmd.com_query.query);
777777
int fail = command_service_run_command(session, COM_QUERY, &cmd,
778-
&my_charset_utf8_general_ci, &sql_cbs,
779-
text_or_binary, ctx);
778+
&my_charset_utf8mb3_general_ci,
779+
&sql_cbs, text_or_binary, ctx);
780780
if (fail)
781781
LogPluginErrMsg(ERROR_LEVEL, ER_LOG_PRINTF_MSG,
782782
"test_sql_all_col_types - ret code : %d", fail);

0 commit comments

Comments
 (0)