From 108fbcf572b020758396ba014ee1ef64dc06b084 Mon Sep 17 00:00:00 2001 From: David Hall Date: Wed, 26 Jul 2017 11:53:08 -0500 Subject: [PATCH] MCOL-523 Add UDAF and UDAnF SDK --- primitives/primproc/primitiveserver.cpp | 8 ++++---- utils/udfsdk/mcsv1_udaf.h | 4 ++-- utils/windowfunction/wf_udaf.cpp | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index 1d477be86..ca7cd4f35 100755 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -2211,10 +2211,10 @@ boost::shared_ptr BPPV::next() void BPPV::abort() { sendThread->abort(); - BOOST_FOREACH( boost::shared_ptr bpp, v ) - { - bpp->unlock(); - } + BOOST_FOREACH( boost::shared_ptr bpp, v ) + { + bpp->unlock(); + } } bool BPPV::aborted() diff --git a/utils/udfsdk/mcsv1_udaf.h b/utils/udfsdk/mcsv1_udaf.h index 382e01d4a..e1f7318db 100755 --- a/utils/udfsdk/mcsv1_udaf.h +++ b/utils/udfsdk/mcsv1_udaf.h @@ -376,8 +376,8 @@ private: 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 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 fEndConstant; // for end frame WF_PRECEEDIMG or WF_FOLLOWING + int32_t fStartConstant; // for start frame WFPRECEEDOMG or WF_FOLLOWING + int32_t fEndConstant; // for end frame WFPRECEEDOMG or WF_FOLLOWING std::string functionName; mcsv1sdk::mcsv1_UDAF* func; diff --git a/utils/windowfunction/wf_udaf.cpp b/utils/windowfunction/wf_udaf.cpp index 20d8c5af7..a2931f293 100755 --- a/utils/windowfunction/wf_udaf.cpp +++ b/utils/windowfunction/wf_udaf.cpp @@ -413,7 +413,6 @@ void WF_udaf::operator()(int64_t b, int64_t e, int64_t c) { mcsv1sdk::mcsv1_UDAF::ReturnCode rc; uint64_t colOut = fFieldIndex[0]; - static_any::any valOut; if ((fFrameUnit == WF__FRAME_ROWS) || (fPrev == -1) ||