database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-3536 collation

Browse Source
This commit is contained in:
David Hall
2020-05-14 16:02:49 -05:00
parent 04fdacb927
commit 1f3d1e6fd6
41 changed files with 667 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/rowgroup/rowaggregation.cpp
View File

@ -49,18 +49,15 @@
#include "funcexp.h"
#include "rowaggregation.h"
#include "calpontsystemcatalog.h"
//#include "utils_utf8.h"
#include "utils_utf8.h"
//..comment out NDEBUG to enable assertions, uncomment NDEBUG to disable
//#define NDEBUG
#include "funcexp/utils_utf8.h"
using namespace std;
using namespace boost;
using namespace dataconvert;
// inlines of RowAggregation that used only in this file
namespace
{
@ -401,7 +398,7 @@ void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, i
#ifdef STRCOLL_ENH__
else
{
int tmp = funcexp::utf8::idb_strcoll(val1.c_str(), val2.c_str());
int tmp = utf8::idb_strcoll(val1.c_str(), val2.c_str());
if ((tmp < 0 && func == rowgroup::ROWAGG_MIN) ||
(tmp > 0 && func == rowgroup::ROWAGG_MAX))