database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-4422 Remove mariadb.h and my_sys.h dependency from collation.h

Browse Source
This commit is contained in:
Alexander Barkov
2020-11-30 14:18:26 +04:00
parent 454ec4be99
commit 2ea73846b9
26 changed files with 175 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
utils/common/collation.h
View File

@ -1,9 +1,101 @@
// These are the common headers needed to use the MariaDB collation library
/*
Copyright (C) 2020 MariaDB Corporation
// This must be included after any boost headers, or anything that includes
// boost headers. <mariadb.h> and boost are not friends.
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <m_ctype.h>
#include <myisampack.h>
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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA. */
#ifndef COLLATION_H_INCLUDED
#define COLLATION_H_INCLUDED
/*
Redefine definitions used by MariaDB m_ctype.h.
This is needed to avoid including <mariadb.h> and <my_sys.h>,
which conflict with many MCS and boost headers.
*/
#ifndef FALSE
#define FALSE (0)
#endif
#ifndef TRUE
#define TRUE (1)
#endif
#ifndef DBUG_ASSERT
#define DBUG_ASSERT(x) idbassert(x)
#define DBUG_ASSERT_TEMPORARILY_DEFINED
#endif
#ifndef MYSQL_PLUGIN_IMPORT
#if (defined(_WIN32) && defined(MYSQL_DYNAMIC_PLUGIN))
#define MYSQL_PLUGIN_IMPORT __declspec(dllimport)
#else
#define MYSQL_PLUGIN_IMPORT
#endif
#endif
typedef long long int longlong;
typedef unsigned long long int ulonglong;
typedef uint32_t uint32;
typedef uint16_t uint16;
typedef char my_bool;
typedef unsigned char uchar;
#if defined(__GNUC__) && !defined(_lint)
typedef char pchar; /* Mixed prototypes can take char */
typedef char puchar; /* Mixed prototypes can take char */
typedef char pbool; /* Mixed prototypes can take char */
typedef short pshort; /* Mixed prototypes can take short int */
typedef float pfloat; /* Mixed prototypes can take float */
#else
typedef int pchar; /* Mixed prototypes can't take char */
typedef uint puchar; /* Mixed prototypes can't take char */
typedef int pbool; /* Mixed prototypes can't take char */
typedef int pshort; /* Mixed prototypes can't take short int */
typedef double pfloat; /* Mixed prototypes can't take float */
#endif
typedef const struct charset_info_st CHARSET_INFO;
extern "C" MYSQL_PLUGIN_IMPORT CHARSET_INFO *default_charset_info;
#include "m_ctype.h"
#undef FALSE
#undef TRUE
#ifdef DBUG_ASSERT_TEMPORARILY_DEFINED
#undef DBUG_ASSERT
#endif
namespace datatypes
{
// A reference to MariaDB CHARSET_INFO.
class Charset
{
protected:
const struct charset_info_st & mCharset;
public:
Charset(CHARSET_INFO & cs) :mCharset(cs) { }
Charset(uint32_t charsetNumber);
CHARSET_INFO & getCharset() const { return mCharset; }
};
} // end of namespace datatypes
#endif

29
utils/common/mariadb_my_sys.h Normal file
View File

@ -0,0 +1,29 @@
/*
Copyright (C) 2020 MariaDB Corporation
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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA. */
#ifndef MARIADB_MY_SYS_H_INCLUDED
#define MARIADB_MY_SYS_H_INCLUDED
// These are the common headers needed to use the MariaDB mysys library.
// This must be included after any boost headers, or anything that includes
// boost headers. <mariadb.h> and boost are not friends.
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#endif

60
utils/common/utils_utf8.cpp
View File

@ -16,62 +16,24 @@
#include "utils_utf8.h"
#include "collation.h"
namespace utf8
#include "mariadb_my_sys.h"
#include <m_ctype.h>
namespace datatypes
{
/*
* mcs_strcoll
*/
int mcs_strcoll(const char* str1, const char* str2, const uint32_t charsetNumber)
static inline CHARSET_INFO & get_charset_or_bin(int32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncoll(str1, strlen(str1), str2, strlen(str2));
CHARSET_INFO *cs= get_charset(charsetNumber, MYF(MY_WME));
return cs ? *cs : my_charset_bin;
}
int mcs_strcoll(const char* str1, const uint32_t l1, const char* str2, const uint32_t l2, const uint32_t charsetNumber)
Charset::Charset(uint32_t charsetNumber)
:mCharset(get_charset_or_bin(charsetNumber))
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncoll(str1, l1, str2, l2);
}
int mcs_strcoll(const std::string* str1, const std::string* str2, const uint32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncoll(str1->c_str(), str1->length(), str2->c_str(), str2->length());
}
int mcs_strcoll(const std::string& str1, const std::string& str2, const uint32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncoll(str1.c_str(), str1.length(), str2.c_str(), str2.length());
}
/*
* mcs_strcollsp
*/
int mcs_strcollsp(const char* str1, const char* str2, const uint32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncollsp(str1, strlen(str1), str2, strlen(str2));
}
int mcs_strcollsp(const char* str1, uint32_t l1, const char* str2, const uint32_t l2, const uint32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncollsp(str1, l1, str2, l2);
}
int mcs_strcollsp(const std::string* str1, const std::string* str2, const uint32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncollsp(str1->c_str(), str1->length(), str2->c_str(), str2->length());
}
int mcs_strcollsp(const std::string& str1, const std::string& str2, const uint32_t charsetNumber)
{
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
return cs->strnncollsp(str1.c_str(), str1.length(), str2.c_str(), str2.length());
}
} //namespace utf8