database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Optimize make_lex_string() to not call alloc_root twice.

Browse Source
This commit is contained in:
Michael Widenius
2017-06-18 10:01:24 +03:00
committed by Sergei Golubchik
parent 8bfda2f0af
commit af06683b73
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_class.h
View File

@ -3368,17 +3368,31 @@ public:
LEX_STRING *make_lex_string(const char* str, uint length) LEX_STRING *make_lex_string(const char* str, uint length)
{ {
LEX_STRING *lex_str; LEX_STRING *lex_str;
if (!(lex_str= (LEX_STRING *)alloc_root(mem_root, sizeof(LEX_STRING)))) char *tmp;
if (!(lex_str= (LEX_STRING *) alloc_root(mem_root, sizeof(LEX_STRING) +
length+1)))
return 0; return 0;
return make_lex_string(lex_str, str, length); tmp= (char*) (lex_str+1);
lex_str->str= tmp;
memcpy(tmp, str, length);
tmp[length]= 0;
lex_str->length= length;
return lex_str;
} }
LEX_CSTRING *make_clex_string(const char* str, uint length) LEX_CSTRING *make_clex_string(const char* str, uint length)
{ {
LEX_CSTRING *lex_str; LEX_CSTRING *lex_str;
if (!(lex_str= (LEX_CSTRING *)alloc_root(mem_root, sizeof(LEX_CSTRING)))) char *tmp;
if (!(lex_str= (LEX_CSTRING *)alloc_root(mem_root, sizeof(LEX_CSTRING) +
length+1)))
return 0; return 0;
return make_lex_string(lex_str, str, length); tmp= (char*) (lex_str+1);
lex_str->str= tmp;
memcpy(tmp, str, length);
tmp[length]= 0;
lex_str->length= length;
return lex_str;
} }
// Allocate LEX_STRING for character set conversion // Allocate LEX_STRING for character set conversion