database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

break compile dependecy on ALARMManager.h

Browse Source
This commit is contained in:
David Mott
2019-04-28 21:26:20 -05:00
parent 56767ae793
commit 6bac032d56
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/rowgroup/rowaggregation.cpp
View File

@ -47,7 +47,7 @@
#include "funcexp.h" #include "funcexp.h"
#include "rowaggregation.h" #include "rowaggregation.h"
#include "calpontsystemcatalog.h" #include "calpontsystemcatalog.h"
#include "utils_utf8.h" //#include "utils_utf8.h"
//..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable //..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
//#define NDEBUG //#define NDEBUG
@ -57,6 +57,15 @@ using namespace std;
using namespace boost; using namespace boost;
using namespace dataconvert; using namespace dataconvert;
namespace funcexp
{
namespace utf8
{
int idb_strcoll(const char*, const char*);
}
}
// inlines of RowAggregation that used only in this file // inlines of RowAggregation that used only in this file
namespace namespace
{ {
@ -379,6 +388,7 @@ inline void RowAggregation::updateFloatMinMax(float val1, float val2, int64_t co
} }
#define STRCOLL_ENH__ #define STRCOLL_ENH__
void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func) void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func)