database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

MCOL-1201 manual rebase with develop. Obsoletes branch MCOL-1201

Browse Source
This commit is contained in:
David Hall
2018-05-11 09:50:10 -05:00
parent 12b1d99f51
commit 6fa7dded6f
30 changed files with 2255 additions and 1196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/udfsdk/mcsv1_udaf.cpp
View File

@@ -36,6 +36,8 @@ UDAF_MAP UDAFMap::fm;
#include "ssq.h"
#include "median.h"
#include "avg_mode.h"
#include "regr_avgx.h"
#include "avgx.h"
UDAF_MAP& UDAFMap::getMap()
{
if (fm.size() > 0)
@@ -52,6 +54,8 @@ UDAF_MAP& UDAFMap::getMap()
fm["ssq"] = new ssq();
fm["median"] = new median();
fm["avg_mode"] = new avg_mode();
fm["regr_avgx"] = new regr_avgx();
fm["avgx"] = new avgx();
return fm;
}
@@ -115,8 +119,8 @@ bool mcsv1Context::operator==(const mcsv1Context& c) const
{
// We don't test the per row data fields. They don't determine
// if it's the same Context.
if (getName() != c.getName()
|| fRunFlags != c.fRunFlags
if (getName() != c.getName()
||fRunFlags != c.fRunFlags
|| fContextFlags != c.fContextFlags
|| fUserDataSize != c.fUserDataSize
|| fResultType != c.fResultType
@@ -125,7 +129,8 @@ bool mcsv1Context::operator==(const mcsv1Context& c) const
|| fStartFrame != c.fStartFrame
|| fEndFrame != c.fEndFrame
|| fStartConstant != c.fStartConstant
|| fEndConstant != c.fEndConstant)
|| fEndConstant != c.fEndConstant
|| fParamCount != c.fParamCount)
return false;
return true;
@@ -217,6 +222,7 @@ void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
b << (uint32_t)fEndFrame;
b << fStartConstant;
b << fEndConstant;
b << fParamCount;
}
void mcsv1Context::unserialize(messageqcpp::ByteStream& b)
@@ -238,6 +244,7 @@ void mcsv1Context::unserialize(messageqcpp::ByteStream& b)
fEndFrame = (WF_FRAME)frame;
b >> fStartConstant;
b >> fEndConstant;
b >> fParamCount;
}
void UserData::serialize(messageqcpp::ByteStream& bs) const