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

MCOL-523 Add UDAF and UDAnF SDK

Browse Source
This commit is contained in:
David Hall
2017-07-26 11:53:08 -05:00
parent bc2a4e7795
commit 108fbcf572
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
primitives/primproc/primitiveserver.cpp
View File

@ -2211,10 +2211,10 @@ boost::shared_ptr<BatchPrimitiveProcessor> BPPV::next()
void BPPV::abort() void BPPV::abort()
{ {
sendThread->abort(); sendThread->abort();
BOOST_FOREACH( boost::shared_ptr<BatchPrimitiveProcessor> bpp, v ) BOOST_FOREACH( boost::shared_ptr<BatchPrimitiveProcessor> bpp, v )
{ {
bpp->unlock(); bpp->unlock();
} }
} }
bool BPPV::aborted() bool BPPV::aborted()

4
utils/udfsdk/mcsv1_udaf.h
View File

@ -376,8 +376,8 @@ private:
int64_t fRowCnt; // The number of rows involved in this aggregate. int64_t fRowCnt; // The number of rows involved in this aggregate.
WF_FRAME fStartFrame; // Is set to default to start, then modified by the actual frame in the call WF_FRAME fStartFrame; // Is set to default to start, then modified by the actual frame in the call
WF_FRAME fEndFrame; // Is set to default to start, then modified by the actual frame in the call WF_FRAME fEndFrame; // Is set to default to start, then modified by the actual frame in the call
int32_t fStartConstant; // for start frame WF_PRECEEDIMG or WF_FOLLOWING int32_t fStartConstant; // for start frame WFPRECEEDOMG or WF_FOLLOWING
int32_t fEndConstant; // for end frame WF_PRECEEDIMG or WF_FOLLOWING int32_t fEndConstant; // for end frame WFPRECEEDOMG or WF_FOLLOWING
std::string functionName; std::string functionName;
mcsv1sdk::mcsv1_UDAF* func; mcsv1sdk::mcsv1_UDAF* func;

1
utils/windowfunction/wf_udaf.cpp
View File

@ -413,7 +413,6 @@ void WF_udaf<T>::operator()(int64_t b, int64_t e, int64_t c)
{ {
mcsv1sdk::mcsv1_UDAF::ReturnCode rc; mcsv1sdk::mcsv1_UDAF::ReturnCode rc;
uint64_t colOut = fFieldIndex[0]; uint64_t colOut = fFieldIndex[0];
static_any::any valOut;
if ((fFrameUnit == WF__FRAME_ROWS) || if ((fFrameUnit == WF__FRAME_ROWS) ||
(fPrev == -1) || (fPrev == -1) ||