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

Merge pull request #1624 from mariadb-corporation/develop-bar-MCOL-4422

Browse Source 
MCOL-4422 Remove mariadb.h and my_sys.h dependency from collation.h
This commit is contained in:
Roman Nozdrin
2020-11-30 15:01:17 +03:00
committed by GitHub
parent d6e542ad28 2ea73846b9
commit 2003417a89
26 changed files with 175 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/rowgroup/rowaggregation.h
View File

@ -53,9 +53,8 @@
#include "mcsv1_udaf.h"
#include "constantcolumn.h"
// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;
#include "collation.h"
// To do: move code that depends on joblist to a proper subsystem.
namespace joblist
{

4
utils/rowgroup/rowgroup.cpp
View File

@ -1240,7 +1240,7 @@ const CHARSET_INFO* Row::getCharset(uint32_t col) const
{
if (charsets[col] == NULL)
{
const_cast<CHARSET_INFO**>(charsets)[col] = get_charset(charsetNumbers[col], MYF(MY_WME));
const_cast<CHARSET_INFO**>(charsets)[col] = & datatypes::Charset(charsetNumbers[col]).getCharset();
}
return charsets[col];
}
@ -1761,7 +1761,7 @@ const CHARSET_INFO* RowGroup::getCharset(uint32_t col)
{
if (charsets[col] == NULL)
{
charsets[col] = get_charset(charsetNumbers[col], MYF(MY_WME));
charsets[col] = & datatypes::Charset(charsetNumbers[col]).getCharset();
}
return charsets[col];
}

4
utils/rowgroup/rowgroup.h
View File

@ -59,9 +59,7 @@
#include "../winport/winport.h"
// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;
#include "collation.h"
// Workaround for my_global.h #define of isnan(X) causing a std::std namespace