VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-16 18:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: moving the definition of Lex_cstring from vers_string.h to lex_string.h

Browse Source
This commit is contained in:
Alexander Barkov
2019-08-08 17:31:42 +04:00
parent e98f3bcf53
commit 3e27677b59
2 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sql/lex_string.h
View File

@ -18,8 +18,46 @@
#ifndef LEX_STRING_INCLUDED
#define LEX_STRING_INCLUDED
typedef struct st_mysql_const_lex_string LEX_CSTRING;
class Lex_cstring : public LEX_CSTRING
{
public:
Lex_cstring()
{
str= NULL;
length= 0;
}
Lex_cstring(const char *_str, size_t _len)
{
str= _str;
length= _len;
}
Lex_cstring(const char *start, const char *end)
{
DBUG_ASSERT(start <= end);
str= start;
length= end - start;
}
void set(const char *_str, size_t _len)
{
str= _str;
length= _len;
}
};
class Lex_cstring_strlen: public Lex_cstring
{
public:
Lex_cstring_strlen(const char *from)
:Lex_cstring(from, from ? strlen(from) : 0)
{ }
};
/* Functions to compare if two lex strings are equal */
static inline bool lex_string_cmp(CHARSET_INFO *charset, const LEX_CSTRING *a,

37
sql/vers_string.h
View File

@ -17,6 +17,8 @@
#ifndef VERS_STRING_INCLUDED
#define VERS_STRING_INCLUDED
#include "lex_string.h"
/*
LEX_CSTRING with comparison semantics.
*/
@ -45,41 +47,6 @@ struct Compare_identifiers
}
};
class Lex_cstring : public LEX_CSTRING
{
public:
Lex_cstring()
{
str= NULL;
length= 0;
}
Lex_cstring(const char *_str, size_t _len)
{
str= _str;
length= _len;
}
Lex_cstring(const char *start, const char *end)
{
DBUG_ASSERT(start <= end);
str= start;
length= end - start;
}
void set(const char *_str, size_t _len)
{
str= _str;
length= _len;
}
};
class Lex_cstring_strlen: public Lex_cstring
{
public:
Lex_cstring_strlen(const char *from)
:Lex_cstring(from, from ? strlen(from) : 0)
{ }
};
template <class Compare>
struct Lex_cstring_with_compare : public Lex_cstring