mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup: uuid

Browse source
This commit is contained in:
Sergei Golubchik 2021-08-17 16:58:17 +02:00
parent bdaa7fac89
commit 72fb37ea89
7 changed files with 25 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/my_sys.h
View file

@ -1022,15 +1022,28 @@ int my_getpagesize(void);
int my_msync(int, void *, size_t, int);
#define MY_UUID_SIZE 16
#define MY_UUID_STRING_LENGTH (8+1+4+1+4+1+4+1+12)
#define MY_UUID_ORACLE_STRING_LENGTH (8+4+4+4+12)
#define MY_UUID_BARE_STRING_LENGTH (8+4+4+4+12)
#define MY_UUID_SEPARATORS 4
#define MY_UUID_STRING_LENGTH (MY_UUID_BARE_STRING_LENGTH + MY_UUID_SEPARATORS)
void my_uuid_init(ulong seed1, ulong seed2);
void my_uuid(uchar *guid);
void my_uuid2str(const uchar *guid, char *s);
void my_uuid2str_oracle(const uchar *guid, char *s);
void my_uuid_end(void);
static inline void my_uuid2str(const uchar *guid, char *s, int with_separators)
{
int i;
int mask= with_separators ? ((1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)) : 0;
for (i=0; i < MY_UUID_SIZE; i++, mask >>= 1)
{
*s++= _dig_vec_lower[guid[i] >>4];
*s++= _dig_vec_lower[guid[i] & 15];
if (mask & 1)
*s++= '-';
}
}
const char *my_dlerror(const char *dlpath);
/* character sets */

31
mysys/my_uuid.c
View file

@ -216,37 +216,6 @@ void my_uuid(uchar *to)
}
/**
Convert uuid to string representation
@func my_uuid2str()
@param guid uuid
@param s Output buffer.Must be at least MY_UUID_STRING_LENGTH+1 large.
*/
void my_uuid2str(const uchar *guid, char *s)
{
int i;
for (i=0; i < MY_UUID_SIZE; i++)
{
*s++= _dig_vec_lower[guid[i] >>4];
*s++= _dig_vec_lower[guid[i] & 15];
/* Set '-' at intervals 3, 5, 7 and 9 */
if ((1 << i) & ((1 << 3) | (1 << 5) | (1 << 7) | (1 << 9)))
*s++= '-';
}
}
void my_uuid2str_oracle(const uchar *guid, char *s)
{
int i;
for (i=0; i < MY_UUID_SIZE; i++)
{
*s++= _dig_vec_upper[guid[i] >>4];
*s++= _dig_vec_upper[guid[i] & 15];
}
}
void my_uuid_end()
{
if (my_uuid_inited)

2
sql/backup.cc
View file

@ -535,7 +535,7 @@ static char *add_id_to_buffer(char *ptr, const LEX_CUSTRING *from)
tmp.str= buff;
tmp.length= MY_UUID_STRING_LENGTH;
my_uuid2str(from->str, buff);
my_uuid2str(from->str, buff, 1);
return add_str_to_buffer(ptr, &tmp);
}

10
sql/item_strfunc.cc
View file

@ -4518,18 +4518,14 @@ String *Item_func_uuid::val_str(String *str)
{
DBUG_ASSERT(fixed());
uchar guid[MY_UUID_SIZE];
size_t length= (without_separators ?
MY_UUID_ORACLE_STRING_LENGTH :
MY_UUID_STRING_LENGTH);
size_t length= without_separators ? MY_UUID_BARE_STRING_LENGTH
: MY_UUID_STRING_LENGTH;
str->alloc(length+1);
str->length(length);
str->set_charset(system_charset_info);
my_uuid(guid);
if (without_separators)
my_uuid2str_oracle(guid, (char *)str->ptr());
else
my_uuid2str(guid, (char *)str->ptr());
my_uuid2str(guid, (char *)str->ptr(), !without_separators);
return str;
}

4
sql/item_strfunc.h
View file

@ -2043,8 +2043,8 @@ Item_func_uuid(THD *thd, bool without_separators_arg): Item_str_func(thd),
bool fix_length_and_dec() override
{
collation.set(DTCollation_numeric());
fix_char_length(without_separators ? MY_UUID_ORACLE_STRING_LENGTH :
MY_UUID_STRING_LENGTH);
fix_char_length(without_separators ? MY_UUID_BARE_STRING_LENGTH
: MY_UUID_STRING_LENGTH);
return FALSE;
}
bool const_item() const override { return false; }

2
storage/maria/aria_chk.c
View file

@ -1592,7 +1592,7 @@ static void descript(HA_CHECK *param, register MARIA_HA *info, char *name)
}
compile_time_assert((MY_UUID_STRING_LENGTH + 1) <= sizeof(buff));
buff[MY_UUID_STRING_LENGTH]= 0;
my_uuid2str(share->base.uuid, buff);
my_uuid2str(share->base.uuid, buff, 1);
printf("UUID: %s\n", buff);
if (ma_control_file_inited() &&
memcmp(share->base.uuid, maria_uuid, MY_UUID_SIZE))

2
storage/maria/ma_control_file.c
View file

@ -705,7 +705,7 @@ my_bool print_aria_log_control()
checkpoint_lsn= lsn_korr(buffer + new_cf_create_time_size +
CF_LSN_OFFSET);
logno= uint4korr(buffer + new_cf_create_time_size + CF_FILENO_OFFSET);
my_uuid2str(buffer + CF_UUID_OFFSET, uuid_str);
my_uuid2str(buffer + CF_UUID_OFFSET, uuid_str, 1);
uuid_str[MY_UUID_STRING_LENGTH]= 0;
printf("Block size: %u\n", uint2korr(buffer + CF_BLOCKSIZE_OFFSET));