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-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

14
utils/udfsdk/median.cpp
View File

@ -25,9 +25,9 @@
using namespace mcsv1sdk;
mcsv1_UDAF::ReturnCode median::init(mcsv1Context* context,
COL_TYPES& colTypes)
ColumnDatum* colTypes)
{
if (colTypes.size() < 1)
if (context->getParameterCount() < 1)
{
// The error message will be prepended with
// "The storage engine for the table doesn't support "
@ -35,13 +35,13 @@ mcsv1_UDAF::ReturnCode median::init(mcsv1Context* context,
return mcsv1_UDAF::ERROR;
}
if (colTypes.size() > 1)
if (context->getParameterCount() > 1)
{
context->setErrorMessage("median() with more than 1 argument");
return mcsv1_UDAF::ERROR;
}
if (!(isNumeric(colTypes[0].second)))
if (!(isNumeric(colTypes[0].dataType)))
{
// The error message will be prepended with
// "The storage engine for the table doesn't support "
@ -65,8 +65,7 @@ mcsv1_UDAF::ReturnCode median::reset(mcsv1Context* context)
return mcsv1_UDAF::SUCCESS;
}
mcsv1_UDAF::ReturnCode median::nextValue(mcsv1Context* context,
std::vector<ColumnDatum>& valsIn)
mcsv1_UDAF::ReturnCode median::nextValue(mcsv1Context* context, ColumnDatum* valsIn)
{
static_any::any& valIn = valsIn[0].columnData;
MEDIAN_DATA& data = static_cast<MedianData*>(context->getUserData())->mData;
@ -212,8 +211,7 @@ mcsv1_UDAF::ReturnCode median::evaluate(mcsv1Context* context, static_any::any&
return mcsv1_UDAF::SUCCESS;
}
mcsv1_UDAF::ReturnCode median::dropValue(mcsv1Context* context,
std::vector<ColumnDatum>& valsDropped)
mcsv1_UDAF::ReturnCode median::dropValue(mcsv1Context* context, ColumnDatum* valsDropped)
{
static_any::any& valIn = valsDropped[0].columnData;
MEDIAN_DATA& data = static_cast<MedianData*>(context->getUserData())->mData;