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 Add support for UDAF multiple parm constants

Browse Source
This commit is contained in:
David Hall
2018-05-25 12:56:29 -05:00
parent ec3a3846c3
commit ea70806e93
22 changed files with 265 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/execplan/constantcolumn.h
View File

@ -38,6 +38,8 @@ class ByteStream;
*/
namespace execplan
{
class ConstantColumn;
/**
* @brief A class to represent a constant return column
*

2
dbcon/joblist/jlf_common.cpp
View File

@ -405,7 +405,7 @@ uint32_t getTupleKey(JobInfo& jobInfo, const SRCP& srcp, bool add)
if (add)
{
// setTupleInfo first if add is ture, ok if already set.
// setTupleInfo first if add is true, ok if already set.
const SimpleColumn* sc = dynamic_cast<const SimpleColumn*>(srcp.get());
if (sc != NULL)

10
dbcon/joblist/joblistfactory.cpp
View File

@ -300,6 +300,7 @@ const JobStepVector doProject(const RetColsVector& retCols, JobInfo& jobInfo)
{
const ArithmeticColumn* ac = NULL;
const FunctionColumn* fc = NULL;
const ConstantColumn* cc = NULL;
uint64_t eid = -1;
CalpontSystemCatalog::ColType ct;
ExpressionStep* es = new ExpressionStep(jobInfo);
@ -316,6 +317,11 @@ const JobStepVector doProject(const RetColsVector& retCols, JobInfo& jobInfo)
eid = fc->expressionId();
ct = fc->resultType();
}
else if ((cc = dynamic_cast<const ConstantColumn*>(retCols[i].get())) != NULL)
{
eid = cc->expressionId();
ct = cc->resultType();
}
else
{
std::ostringstream errmsg;
@ -1004,7 +1010,9 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo
for (uint32_t parm = 0; parm < aggParms.size(); ++parm)
{
if (aggc->constCol().get() != NULL)
// Only do the optimization of converting to count(*) if
// there is only one parameter.
if (aggParms.size() == 1 && aggc->constCol().get() != NULL)
{
// replace the aggregate on constant with a count(*)
SRCP clone;

9
dbcon/joblist/windowfunctionstep.cpp
View File

@ -569,6 +569,7 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
for (RetColsVector::iterator i = jobInfo.windowCols.begin(); i < jobInfo.windowCols.end(); i++)
{
bool isUDAF = false;
// window function type
WindowFunctionColumn* wc = dynamic_cast<WindowFunctionColumn*>(i->get());
uint64_t ridx = getColumnIndex(*i, colIndexMap, jobInfo); // result index
@ -590,6 +591,7 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
// if (boost::iequals(wc->functionName(),"UDAF_FUNC")
if (wc->functionName() == "UDAF_FUNC")
{
isUDAF = true;
++wfsUserFunctionCount;
}
@ -646,10 +648,13 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
// column type for functor templates
int ct = 0;
if (isUDAF)
{
ct = wc->getUDAFContext().getResultType();
}
// make sure index is in range
if (fields.size() > 1 && fields[1] >= 0 && static_cast<uint64_t>(fields[1]) < types.size())
else if (fields.size() > 1 && fields[1] >= 0 && static_cast<uint64_t>(fields[1]) < types.size())
ct = types[fields[1]];
// workaround for functions using "within group (order by)" syntax
string fn = boost::to_upper_copy(wc->functionName());

16
primitives/primproc/batchprimitiveprocessor.cpp
View File

@ -1677,15 +1677,11 @@ void BatchPrimitiveProcessor::execute()
}
catch (logging::QueryDataExcept& qex)
{
ostringstream os;
os << qex.what() << endl;
writeErrorMsg(os.str(), qex.errorCode());
writeErrorMsg(qex.what(), qex.errorCode());
}
catch (logging::DictionaryBufferOverflow& db)
{
ostringstream os;
os << db.what() << endl;
writeErrorMsg(os.str(), db.errorCode());
writeErrorMsg(db.what(), db.errorCode());
}
catch (scalar_exception& se)
{
@ -1758,15 +1754,11 @@ void BatchPrimitiveProcessor::execute()
}
catch (IDBExcept& iex)
{
ostringstream os;
os << iex.what() << endl;
writeErrorMsg(os.str(), iex.errorCode(), true, false);
writeErrorMsg(iex.what(), iex.errorCode(), true, false);
}
catch (const std::exception& ex)
{
ostringstream os;
os << ex.what() << endl;
writeErrorMsg(os.str(), logging::batchPrimitiveProcessorErr);
writeErrorMsg(ex.what(), logging::batchPrimitiveProcessorErr);
}
catch (...)
{

7
utils/common/any.hpp
View File

@ -11,15 +11,12 @@
#include <stdint.h>
#include <stdexcept>
#include <cstring>
namespace static_any
{
namespace anyimpl
{
struct bad_any_cast
{
};
struct empty_any
{
};
@ -266,7 +263,7 @@ public:
T& cast()
{
if (policy != anyimpl::get_policy<T>())
throw anyimpl::bad_any_cast();
throw std::runtime_error("static_any: type mismatch in cast");
T* r = reinterpret_cast<T*>(policy->get_value(&object));
return *r;
}

2
utils/loggingcpp/errorcodes.cpp
View File

@ -29,7 +29,7 @@ using namespace std;
namespace logging
{
ErrorCodes::ErrorCodes(): fErrorCodes(), fPreamble("An unexpected condition within the query caused an internal processing error within InfiniDB. Please check the log files for more details. Additional Information: ")
ErrorCodes::ErrorCodes(): fErrorCodes(), fPreamble("An unexpected condition within the query caused an internal processing error within Columnstore. Please check the log files for more details. Additional Information: ")
{
fErrorCodes[batchPrimitiveStepErr] = "error in BatchPrimitiveStep.";
fErrorCodes[tupleBPSErr] = "error in TupleBPS.";

1
utils/messageqcpp/bytestream.h
View File

@ -35,6 +35,7 @@
#include "exceptclasses.h"
#include "serializeable.h"
#include "any.hpp"
class ByteStreamTestSuite;

36
utils/rowgroup/rowaggregation.h
View File

@ -50,6 +50,7 @@
#include "stlpoolallocator.h"
#include "returnedcolumn.h"
#include "mcsv1_udaf.h"
#include "constantcolumn.h"
// To do: move code that depends on joblist to a proper subsystem.
namespace joblist
@ -200,6 +201,13 @@ struct RowAggFunctionCol
// 4. for duplicate - point to the real aggretate column to be copied from
// Set only on UM, the fAuxColumnIndex is defaulted to fOutputColumnIndex+1 on PM.
uint32_t fAuxColumnIndex;
// For UDAF that have more than one parameter and some parameters are constant.
// There will be a series of RowAggFunctionCol created, one for each parameter.
// The first will be a RowUDAFFunctionCol. Subsequent ones will be RowAggFunctionCol
// with fAggFunction == ROWAGG_MULTI_PARM. Order is important.
// If this parameter is constant, that value is here.
SRCP fpConstCol;
};
@ -220,8 +228,11 @@ struct RowUDAFFunctionCol : public RowAggFunctionCol
inputColIndex, outputColIndex, auxColIndex),
bInterrupted(false)
{}
RowUDAFFunctionCol(const RowUDAFFunctionCol& rhs) : RowAggFunctionCol(ROWAGG_UDAF, ROWAGG_FUNCT_UNDEFINE,
rhs.fInputColumnIndex, rhs.fOutputColumnIndex, rhs.fAuxColumnIndex), fUDAFContext(rhs.fUDAFContext)
RowUDAFFunctionCol(const RowUDAFFunctionCol& rhs) :
RowAggFunctionCol(ROWAGG_UDAF, ROWAGG_FUNCT_UNDEFINE, rhs.fInputColumnIndex,
rhs.fOutputColumnIndex, rhs.fAuxColumnIndex),
fUDAFContext(rhs.fUDAFContext),
bInterrupted(false)
{}
virtual ~RowUDAFFunctionCol() {}
@ -238,6 +249,16 @@ inline void RowAggFunctionCol::serialize(messageqcpp::ByteStream& bs) const
bs << (uint8_t)fAggFunction;
bs << fInputColumnIndex;
bs << fOutputColumnIndex;
if (fpConstCol)
{
bs << (uint8_t)1;
fpConstCol.get()->serialize(bs);
}
else
{
bs << (uint8_t)0;
}
}
inline void RowAggFunctionCol::deserialize(messageqcpp::ByteStream& bs)
@ -245,6 +266,13 @@ inline void RowAggFunctionCol::deserialize(messageqcpp::ByteStream& bs)
bs >> (uint8_t&)fAggFunction;
bs >> fInputColumnIndex;
bs >> fOutputColumnIndex;
uint8_t t;
bs >> t;
if (t)
{
fpConstCol.reset(new ConstantColumn);
fpConstCol.get()->unserialize(bs);
}
}
inline void RowUDAFFunctionCol::serialize(messageqcpp::ByteStream& bs) const
@ -586,7 +614,7 @@ protected:
virtual void doAvg(const Row&, int64_t, int64_t, int64_t);
virtual void doStatistics(const Row&, int64_t, int64_t, int64_t);
virtual void doBitOp(const Row&, int64_t, int64_t, int);
virtual void doUDAF(const Row&, int64_t, int64_t, int64_t, RowUDAFFunctionCol* rowUDAF, uint64_t& funcColsIdx);
virtual void doUDAF(const Row&, int64_t, int64_t, int64_t, uint64_t& funcColsIdx);
virtual bool countSpecial(const RowGroup* pRG)
{
fRow.setIntField<8>(fRow.getIntField<8>(0) + pRG->getRowCount(), 0);
@ -902,7 +930,7 @@ protected:
void doStatistics(const Row&, int64_t, int64_t, int64_t);
void doGroupConcat(const Row&, int64_t, int64_t);
void doBitOp(const Row&, int64_t, int64_t, int);
void doUDAF(const Row&, int64_t, int64_t, int64_t, RowUDAFFunctionCol* rowUDAF, uint64_t& funcColsIdx);
void doUDAF(const Row&, int64_t, int64_t, int64_t, uint64_t& funcColsIdx);
bool countSpecial(const RowGroup* pRG)
{
return false;

1
utils/udfsdk/allnull.h
View File

@ -48,7 +48,6 @@
#include <cstdlib>
#include <string>
#include <vector>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

1
utils/udfsdk/avg_mode.h
View File

@ -56,7 +56,6 @@
#include <cstdlib>
#include <string>
#include <vector>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

1
utils/udfsdk/avgx.h
View File

@ -35,7 +35,6 @@
#include <cstdlib>
#include <string>
#include <vector>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

1
utils/udfsdk/mcsv1_udaf.h
View File

@ -68,7 +68,6 @@
#include <vector>
#include <map>
#include <boost/shared_ptr.hpp>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

1
utils/udfsdk/median.h
View File

@ -56,7 +56,6 @@
#include <cstdlib>
#include <string>
#include <vector>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

6
utils/udfsdk/regr_avgx.cpp
View File

@ -82,7 +82,7 @@ mcsv1_UDAF::ReturnCode regr_avgx::nextValue(mcsv1Context* context, ColumnDatum*
{
return mcsv1_UDAF::SUCCESS; // Ought not happen when UDAF_IGNORE_NULLS is on.
}
if (valIn_x.empty() || valIn_y.empty())
if (valIn_x.empty() || valIn_y.empty()) // Usually empty if NULL. Probably redundant
{
return mcsv1_UDAF::SUCCESS; // Ought not happen when UDAF_IGNORE_NULLS is on.
}
@ -107,10 +107,6 @@ mcsv1_UDAF::ReturnCode regr_avgx::nextValue(mcsv1Context* context, ColumnDatum*
{
val = valIn_x.cast<int>();
}
else if (valIn_x.compatible(longTypeId))
{
val = valIn_x.cast<long>();
}
else if (valIn_x.compatible(llTypeId))
{
val = valIn_x.cast<long long>();

1
utils/udfsdk/regr_avgx.h
View File

@ -35,7 +35,6 @@
#include <cstdlib>
#include <string>
#include <vector>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

1
utils/udfsdk/ssq.h
View File

@ -56,7 +56,6 @@
#include <cstdlib>
#include <string>
#include <vector>
#include <boost/any.hpp>
#ifdef _MSC_VER
#include <unordered_map>
#else

33
utils/udfsdk/udfsdk.vpj
View File

@ -238,38 +238,5 @@
N="Makefile"
Type="Makefile"/>
</Folder>
<Folder
Name="doc"
Filters="*.rst">
<Folder
Name="reference"
Filters="">
<F N="docs/source/reference/api.rst"/>
<F N="docs/source/reference/ByteStream.rst"/>
<F N="docs/source/reference/ColumnDatum.rst"/>
<F N="docs/source/reference/index.rst"/>
<F N="docs/source/reference/MariaDBUDAF.rst"/>
<F N="docs/source/reference/mcsv1_UDAF.rst"/>
<F N="docs/source/reference/mcsv1Context.rst"/>
<F N="docs/source/reference/UDAFMap.rst"/>
<F N="docs/source/reference/UserData.rst"/>
</Folder>
<Folder
Name="usage"
Filters="">
<F N="docs/source/usage/cmakelists.rst"/>
<F N="docs/source/usage/compile.rst"/>
<F N="docs/source/usage/copylibs.rst"/>
<F N="docs/source/usage/headerfile.rst"/>
<F N="docs/source/usage/index.rst"/>
<F N="docs/source/usage/introduction.rst"/>
<F N="docs/source/usage/memoryallocation.rst"/>
<F N="docs/source/usage/sourcefile.rst"/>
</Folder>
<F N="docs/source/changelog.rst"/>
<F N="docs/source/conf.py"/>
<F N="docs/source/index.rst"/>
<F N="docs/source/license.rst"/>
</Folder>
</Files>
</Project>

276
utils/windowfunction/wf_udaf.cpp
View File

@ -451,7 +451,7 @@ void WF_udaf<T>::operator()(int64_t b, int64_t e, int64_t c)
{
mcsv1sdk::mcsv1_UDAF::ReturnCode rc;
uint64_t colOut = fFieldIndex[0];
bool isNull = false;
if ((fFrameUnit == WF__FRAME_ROWS) ||
(fPrev == -1) ||
(!fPeer->operator()(getPointer(fRowData->at(c)), getPointer(fRowData->at(fPrev)))))
@ -468,13 +468,24 @@ void WF_udaf<T>::operator()(int64_t b, int64_t e, int64_t c)
// Put the parameter metadata (type, scale, precision) into valsIn
mcsv1sdk::ColumnDatum valsIn[getContext().getParameterCount()];
ConstantColumn* cc = NULL;
for (uint32_t i = 0; i < getContext().getParameterCount(); ++i)
{
uint64_t colIn = fFieldIndex[i+1];
mcsv1sdk::ColumnDatum& datum = valsIn[i];
datum.dataType = fRow.getColType(colIn);
datum.scale = fRow.getScale(colIn);
datum.precision = fRow.getPrecision(colIn);
cc = static_cast<ConstantColumn*>(fConstantParms[i].get());
if (cc)
{
datum.dataType = cc->resultType().colDataType;
datum.scale = cc->resultType().scale;
datum.precision = cc->resultType().precision;
}
else
{
uint64_t colIn = fFieldIndex[i+1];
datum.dataType = fRow.getColType(colIn);
datum.scale = fRow.getScale(colIn);
datum.precision = fRow.getPrecision(colIn);
}
}
if (b <= c && c <= e)
@ -494,12 +505,14 @@ void WF_udaf<T>::operator()(int64_t b, int64_t e, int64_t c)
uint32_t flags[getContext().getParameterCount()];
for (uint32_t k = 0; k < getContext().getParameterCount(); ++k)
{
cc = static_cast<ConstantColumn*>(fConstantParms[k].get());
uint64_t colIn = fFieldIndex[k+1];
mcsv1sdk::ColumnDatum& datum = valsIn[k];
// Turn on Null flags or skip based on respect nulls
flags[k] = 0;
if (fRow.isNullValue(colIn) == true)
if ((!cc && fRow.isNullValue(colIn) == true)
|| (cc && cc->type() == ConstantColumn::NULLDATA))
{
if (!bRespectNulls)
{
@ -510,133 +523,196 @@ void WF_udaf<T>::operator()(int64_t b, int64_t e, int64_t c)
flags[k] |= mcsv1sdk::PARAM_IS_NULL;
}
// MCOL-1201 Multi-Paramter calls
switch (datum.dataType)
if (!bHasNull && !(flags[k] & mcsv1sdk::PARAM_IS_NULL))
{
case CalpontSystemCatalog::TINYINT:
case CalpontSystemCatalog::SMALLINT:
case CalpontSystemCatalog::MEDINT:
case CalpontSystemCatalog::INT:
case CalpontSystemCatalog::BIGINT:
case CalpontSystemCatalog::DECIMAL:
switch (datum.dataType)
{
int64_t valIn;
getValue(colIn, valIn);
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
case CalpontSystemCatalog::TINYINT:
case CalpontSystemCatalog::SMALLINT:
case CalpontSystemCatalog::MEDINT:
case CalpontSystemCatalog::INT:
case CalpontSystemCatalog::BIGINT:
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
int64_t valIn;
if (cc)
{
continue;
valIn = cc->getIntVal(fRow, isNull);
}
else
{
getValue(colIn, valIn);
}
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
{
continue;
}
if (fDistinct)
fDistinctSet.insert(valIn);
if (fDistinct)
fDistinctSet.insert(valIn);
}
datum.columnData = valIn;
break;
}
datum.columnData = valIn;
break;
}
case CalpontSystemCatalog::UTINYINT:
case CalpontSystemCatalog::USMALLINT:
case CalpontSystemCatalog::UMEDINT:
case CalpontSystemCatalog::UINT:
case CalpontSystemCatalog::UBIGINT:
case CalpontSystemCatalog::UDECIMAL:
{
uint64_t valIn;
getValue(colIn, valIn);
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
case CalpontSystemCatalog::DECIMAL:
case CalpontSystemCatalog::UDECIMAL:
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
int64_t valIn;
if (cc)
{
continue;
valIn = cc->getDecimalVal(fRow, isNull).value;
}
else
{
getValue(colIn, valIn);
}
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
{
continue;
}
if (fDistinct)
fDistinctSet.insert(valIn);
if (fDistinct)
fDistinctSet.insert(valIn);
}
datum.columnData = valIn;
break;
}
datum.columnData = valIn;
break;
}
case CalpontSystemCatalog::DOUBLE:
case CalpontSystemCatalog::UDOUBLE:
{
double valIn;
getValue(colIn, valIn);
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
case CalpontSystemCatalog::UTINYINT:
case CalpontSystemCatalog::USMALLINT:
case CalpontSystemCatalog::UMEDINT:
case CalpontSystemCatalog::UINT:
case CalpontSystemCatalog::UBIGINT:
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
uint64_t valIn;
if (cc)
{
continue;
valIn = cc->getUintVal(fRow, isNull);
}
else
{
getValue(colIn, valIn);
}
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
{
continue;
}
if (fDistinct)
fDistinctSet.insert(valIn);
if (fDistinct)
fDistinctSet.insert(valIn);
}
datum.columnData = valIn;
break;
}
datum.columnData = valIn;
break;
}
case CalpontSystemCatalog::FLOAT:
case CalpontSystemCatalog::UFLOAT:
{
float valIn;
getValue(colIn, valIn);
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
case CalpontSystemCatalog::DOUBLE:
case CalpontSystemCatalog::UDOUBLE:
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
double valIn;
if (cc)
{
continue;
valIn = cc->getDoubleVal(fRow, isNull);
}
else
{
getValue(colIn, valIn);
}
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
{
continue;
}
if (fDistinct)
fDistinctSet.insert(valIn);
if (fDistinct)
fDistinctSet.insert(valIn);
}
datum.columnData = valIn;
break;
}
datum.columnData = valIn;
break;
}
case CalpontSystemCatalog::CHAR:
case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::VARBINARY:
case CalpontSystemCatalog::TEXT:
case CalpontSystemCatalog::BLOB:
{
string valIn;
getValue(colIn, valIn);
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
case CalpontSystemCatalog::FLOAT:
case CalpontSystemCatalog::UFLOAT:
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
float valIn;
if (cc)
{
continue;
valIn = cc->getFloatVal(fRow, isNull);
}
else
{
getValue(colIn, valIn);
}
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
{
continue;
}
if (fDistinct)
fDistinctSet.insert(valIn);
if (fDistinct)
fDistinctSet.insert(valIn);
}
datum.columnData = valIn;
break;
}
datum.columnData = valIn;
break;
}
default:
{
string errStr = "(" + colType2String[i] + ")";
errStr = IDBErrorInfo::instance()->errorMsg(ERR_WF_INVALID_PARM_TYPE, errStr);
cerr << errStr << endl;
throw IDBExcept(errStr, ERR_WF_INVALID_PARM_TYPE);
case CalpontSystemCatalog::CHAR:
case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::VARBINARY:
case CalpontSystemCatalog::TEXT:
case CalpontSystemCatalog::BLOB:
{
string valIn;
if (cc)
{
valIn = cc->getStrVal(fRow, isNull);
}
else
{
getValue(colIn, valIn);
}
// Check for distinct, if turned on.
// Currently, distinct only works on the first parameter.
if (k == 0)
{
if ((fDistinct) || (fDistinctSet.find(valIn) != fDistinctSet.end()))
{
continue;
}
break;
if (fDistinct)
fDistinctSet.insert(valIn);
}
datum.columnData = valIn;
break;
}
default:
{
string errStr = "(" + colType2String[i] + ")";
errStr = IDBErrorInfo::instance()->errorMsg(ERR_WF_INVALID_PARM_TYPE, errStr);
cerr << errStr << endl;
throw IDBExcept(errStr, ERR_WF_INVALID_PARM_TYPE);
break;
}
}
}
// Skip if any value is NULL and respect nulls is off.

2
utils/windowfunction/wf_udaf.h
View File

@ -53,8 +53,6 @@ public:
// A class to control the execution of User Define Analytic Functions (UDAnF)
// as defined by a specialization of mcsv1sdk::mcsv1_UDAF
// The template parameter is currently only used to support DISTINCT, as
// as that is done via a set<T>
template<typename T>
class WF_udaf : public WindowFunctionType
{

24
utils/windowfunction/windowfunctiontype.cpp
View File

@ -39,7 +39,6 @@ using namespace logging;
using namespace ordering;
#include "calpontsystemcatalog.h"
#include "constantcolumn.h"
#include "dataconvert.h" // int64_t IDB_pow[19]
using namespace execplan;
@ -228,6 +227,9 @@ WindowFunctionType::makeWindowFunction(const string& name, int ct, WindowFunctio
break;
}
// Copy the only the constant parameter pointers
af->constParms(wc->functionParms());
return af;
}
@ -634,6 +636,26 @@ void* WindowFunctionType::getNullValueByType(int ct, int pos)
return v;
}
void WindowFunctionType::constParms(const std::vector<SRCP>& functionParms)
{
// fConstantParms will end up with a copy of functionParms, but only
// the constant types will be copied. Other types will take up space but
// be NULL. This allows us to acces the constants without the overhead
// of dynamic_cast for every row.
for (size_t i = 0; i < functionParms.size(); ++i)
{
ConstantColumn* cc = dynamic_cast<ConstantColumn*>(functionParms[i].get());
if (cc)
{
fConstantParms.push_back(functionParms[i]);
}
else
{
fConstantParms.push_back(SRCP(cc));
}
}
}
} //namespace
// vim:ts=4 sw=4:

7
utils/windowfunction/windowfunctiontype.h
View File

@ -31,7 +31,7 @@
#include "returnedcolumn.h"
#include "rowgroup.h"
#include "windowframe.h"
#include "constantcolumn.h"
namespace ordering
{
@ -198,6 +198,8 @@ public:
fStep = step;
}
void constParms(const std::vector<SRCP>& functionParms);
static boost::shared_ptr<WindowFunctionType> makeWindowFunction(const std::string&, int ct, WindowFunctionColumn* wc);
protected:
@ -244,6 +246,9 @@ protected:
// output and input field indices: [0] - output
std::vector<int64_t> fFieldIndex;
// constant function parameters -- needed for udaf with constant
std::vector<SRCP> fConstantParms;
// row meta data
rowgroup::RowGroup fRowGroup;
rowgroup::Row fRow;