You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-12-18 13:54:11 +03:00
mcsconfig.h and my_config.h have the following pre-processor definitions: 1. Conflicting definitions coming from the standard cmake definitions: - PACKAGE - PACKAGE_BUGREPORT - PACKAGE_NAME - PACKAGE_STRING - PACKAGE_TARNAME - PACKAGE_VERSION - VERSION 2. Conflicting definitions of other kinds: - HAVE_STRTOLL - this is a dirt in MariaDB headers. Should be fixed in the server code. my_config.h erroneously performs "#define HAVE_STRTOLL" instead of "#define HAVE_STRTOLL 1". in some cases. The former is not CMake compatible style. The latter is. 3. Non-conflicting definitions: Otherwise, mcsconfig.h and my_config.h should be mutually compatible, because both are generated by cmake on the same host machine. So they should have exactly equal definitions like "HAVE_XXX", "SIZEOF_XXX", etc. Observations: - It's OK to include both mcsconfig.h and my_config.h providing that we suppress duplicate definition of the above conflicting types #1 and #2. - There is no a need to suppress duplicate definitions mentioned in #3, as they are compatible! - my_sys.h and m_ctype.h must always follow a CMake configuation header, either my_config.h or mcsconfig.h (or both). They must never be included without any preceeding configuration header. This change make sure that we resolve conflicts by: - either disallowing inclusion of mcsconfig.h and my_config.h at the same time - or by hiding conflicting definitions #1 and #2 (with their later restoring). - also, by making sure that my_sys.h and m_ctype.h always follow a CMake configuration file. Details: - idb_mysql.h can now only be included only after my_config.h An attempt to use idb_mysql.h with mcsconfig.h instead of my_config.h is caught by the "#error" preprocessor directive. - mariadb_my_sys.h can now be only included after mcsconfig.h. An attempt to use mariadb_my_sys.h without mcscofig.h (e.g. with my_config.h) is also caught by "#error". - collation.h now can now be included in two ways. It now has the following effective structure: #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H) // Remember current conflicting definitions on the preprocessor stack // Undefine current conflicting definitions #endif #include "mcsconfig.h" #include "m_ctype.h" #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H) # Restore conflicting definitions from the preprocessor stack #endif and can be included as follows: a. using only mcsconfig.h as a configuration header: // my_config.h must not be included so far #include "collation.h" b. using my_config.h as the first included configuration file: #define PREFER_MY_CONFIG_H // Force conflict resolution #include "my_config.h" // can be included directly or indirectly ... #include "collation.h" Other changes: - Adding helper header files utils/common/mcsconfig_conflicting_defs_remember.h utils/common/mcsconfig_conflicting_defs_restore.h utils/common/mcsconfig_conflicting_defs_undef.h to perform conflict resolution easier. - Removing `#include "collation.h"` from a number of files, as it's automatically included from rowgroup.h. - Removing redundant `#include "utils_utf8.h"`. This change is not directly related to the problem being fixed, but it's nice to remove redundant directives for both collation.h and utils_utf8.h from all the files that do not really need them. (this change could probably have gone as a separate commit) - Changing my_init() to MY_INIT(argv[0]) in the MCS services sources. After the fix of the complitation failure it appeared that ColumnStore services compiled with the debug build crash due to recent changes in safemalloc. The crash happened in strcmp() with `my_progname` as an argument (where my_progname is a mysys global variable). This problem should probably be fixed on the server side as well to avoid passing NULL. But, the majority of MariaDB executable programs also use MY_INIT(argv[0]) rather than my_init(). So let's make MCS do like the other programs do.
226 lines
6.0 KiB
C++
226 lines
6.0 KiB
C++
/*
|
|
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 COLLATION_H_INCLUDED
|
|
#define COLLATION_H_INCLUDED
|
|
|
|
#if defined(PREFER_MY_CONFIG_H)
|
|
|
|
#if !defined(MY_CONFIG_H)
|
|
#error my_config.h was not included (but PREFER_MY_CONFIG_H was set)
|
|
#endif
|
|
|
|
#include "mcsconfig_conflicting_defs_remember.h"
|
|
#include "mcsconfig_conflicting_defs_undef.h"
|
|
|
|
#else
|
|
#if defined(MY_CONFIG_H)
|
|
#error my_config.h was included before mcsconfig.h (and PREFER_MY_CONFIG_H was not set)
|
|
#endif
|
|
#endif //PREFER_MY_CONFIG_H
|
|
|
|
#include "mcsconfig.h"
|
|
|
|
#include "exceptclasses.h"
|
|
#include "conststring.h"
|
|
|
|
/*
|
|
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
|
|
|
|
|
|
#if defined(PREFER_MY_CONFIG_H)
|
|
#include "mcsconfig_conflicting_defs_restore.h"
|
|
#endif
|
|
|
|
|
|
namespace datatypes
|
|
{
|
|
|
|
class MariaDBHasher
|
|
{
|
|
ulong mPart1;
|
|
ulong mPart2;
|
|
public:
|
|
MariaDBHasher()
|
|
:mPart1(1), mPart2(4)
|
|
{ }
|
|
MariaDBHasher & add(CHARSET_INFO * cs, const char *str, size_t length)
|
|
{
|
|
cs->hash_sort((const uchar *) str, length, &mPart1, &mPart2);
|
|
return *this;
|
|
}
|
|
MariaDBHasher & add(CHARSET_INFO *cs, const utils::ConstString &str)
|
|
{
|
|
return add(cs, str.str(), str.length());
|
|
}
|
|
uint32_t finalize() const
|
|
{
|
|
return (uint32_t) mPart1;
|
|
}
|
|
};
|
|
|
|
|
|
// A reference to MariaDB CHARSET_INFO.
|
|
|
|
class Charset
|
|
{
|
|
protected:
|
|
const struct charset_info_st * mCharset;
|
|
public:
|
|
Charset(CHARSET_INFO & cs) :mCharset(&cs) { }
|
|
Charset(CHARSET_INFO *cs)
|
|
:mCharset(cs ? cs : &my_charset_bin)
|
|
{ }
|
|
Charset(uint32_t charsetNumber);
|
|
CHARSET_INFO & getCharset() const { return *mCharset; }
|
|
uint32_t hash(const char *data, uint64_t len) const
|
|
{
|
|
return MariaDBHasher().add(mCharset, data, len).finalize();
|
|
}
|
|
bool eq(const std::string & str1, const std::string & str2) const
|
|
{
|
|
return mCharset->strnncollsp(str1.data(), str1.length(),
|
|
str2.data(), str2.length()) == 0;
|
|
}
|
|
int strnncollsp(const utils::ConstString &str1,
|
|
const utils::ConstString &str2) const
|
|
{
|
|
return mCharset->strnncollsp(str1.str(), str1.length(),
|
|
str2.str(), str2.length());
|
|
}
|
|
int strnncollsp(const char *str1, size_t length1,
|
|
const char *str2, size_t length2) const
|
|
{
|
|
return mCharset->strnncollsp(str1, length1, str2, length2);
|
|
}
|
|
int strnncollsp(const unsigned char *str1, size_t length1,
|
|
const unsigned char *str2, size_t length2) const
|
|
{
|
|
return mCharset->strnncollsp((const char *) str1, length1,
|
|
(const char *) str2, length2);
|
|
}
|
|
bool test_if_important_data(const char *str, const char *end) const
|
|
{
|
|
if (mCharset->state & MY_CS_NOPAD)
|
|
return str < end;
|
|
return str + mCharset->scan(str, end, MY_SEQ_SPACES) < end;
|
|
|
|
}
|
|
bool like(bool neg,
|
|
const utils::ConstString &subject,
|
|
const utils::ConstString &pattern) const
|
|
{
|
|
bool res= !mCharset->wildcmp(subject.str(), subject.end(),
|
|
pattern.str(), pattern.end(),
|
|
'\\','_','%');
|
|
return neg ? !res : res;
|
|
}
|
|
};
|
|
|
|
|
|
class CollationAwareHasher: public Charset
|
|
{
|
|
public:
|
|
CollationAwareHasher(const Charset &cs)
|
|
:Charset(cs)
|
|
{ }
|
|
inline uint32_t operator()(const std::string& s) const
|
|
{
|
|
return operator()(s.data(), s.length());
|
|
}
|
|
inline uint32_t operator()(const char* data, uint64_t len) const
|
|
{
|
|
return Charset::hash(data, len);
|
|
}
|
|
};
|
|
|
|
|
|
class CollationAwareComparator: public Charset
|
|
{
|
|
public:
|
|
CollationAwareComparator(const Charset &cs)
|
|
:Charset(cs)
|
|
{ }
|
|
bool operator()(const std::string & str1, const std::string & str2) const
|
|
{
|
|
return Charset::eq(str1, str2);
|
|
}
|
|
};
|
|
|
|
|
|
|
|
} // end of namespace datatypes
|
|
|
|
#endif
|