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-2091 Don't use in-line initializers, a C++x11 feature.

Browse Source
This commit is contained in:
David Hall
2019-04-15 12:49:43 -05:00
parent f1b908abeb
commit 853dc2a2c1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/rowgroup/rowaggregation.cpp
View File

@ -218,7 +218,6 @@ inline string getStringNullValue()
namespace rowgroup namespace rowgroup
{ {
const std::string typeStr(""); const std::string typeStr("");
const static_any::any& RowAggregation::charTypeId((char)1); const static_any::any& RowAggregation::charTypeId((char)1);
const static_any::any& RowAggregation::scharTypeId((signed char)1); const static_any::any& RowAggregation::scharTypeId((signed char)1);
@ -590,7 +589,8 @@ inline bool RowAggregation::isNull(const RowGroup* pRowGroup, const Row& row, in
RowAggregation::RowAggregation() : RowAggregation::RowAggregation() :
fAggMapPtr(NULL), fRowGroupOut(NULL), fAggMapPtr(NULL), fRowGroupOut(NULL),
fTotalRowCount(0), fMaxTotalRowCount(AGG_ROWGROUP_SIZE), fTotalRowCount(0), fMaxTotalRowCount(AGG_ROWGROUP_SIZE),
fSmallSideRGs(NULL), fLargeSideRG(NULL), fSmallSideCount(0) fSmallSideRGs(NULL), fLargeSideRG(NULL), fSmallSideCount(0),
fOrigFunctionCols(NULL)
{ {
} }
@ -599,7 +599,8 @@ RowAggregation::RowAggregation(const vector<SP_ROWAGG_GRPBY_t>& rowAggGroupByCol
const vector<SP_ROWAGG_FUNC_t>& rowAggFunctionCols) : const vector<SP_ROWAGG_FUNC_t>& rowAggFunctionCols) :
fAggMapPtr(NULL), fRowGroupOut(NULL), fAggMapPtr(NULL), fRowGroupOut(NULL),
fTotalRowCount(0), fMaxTotalRowCount(AGG_ROWGROUP_SIZE), fTotalRowCount(0), fMaxTotalRowCount(AGG_ROWGROUP_SIZE),
fSmallSideRGs(NULL), fLargeSideRG(NULL), fSmallSideCount(0) fSmallSideRGs(NULL), fLargeSideRG(NULL), fSmallSideCount(0),
fOrigFunctionCols(NULL)
{ {
fGroupByCols.assign(rowAggGroupByCols.begin(), rowAggGroupByCols.end()); fGroupByCols.assign(rowAggGroupByCols.begin(), rowAggGroupByCols.end());
fFunctionCols.assign(rowAggFunctionCols.begin(), rowAggFunctionCols.end()); fFunctionCols.assign(rowAggFunctionCols.begin(), rowAggFunctionCols.end());
@ -610,7 +611,7 @@ RowAggregation::RowAggregation(const RowAggregation& rhs):
fAggMapPtr(NULL), fRowGroupOut(NULL), fAggMapPtr(NULL), fRowGroupOut(NULL),
fTotalRowCount(0), fMaxTotalRowCount(AGG_ROWGROUP_SIZE), fTotalRowCount(0), fMaxTotalRowCount(AGG_ROWGROUP_SIZE),
fSmallSideRGs(NULL), fLargeSideRG(NULL), fSmallSideCount(0), fSmallSideRGs(NULL), fLargeSideRG(NULL), fSmallSideCount(0),
fRGContext(rhs.fRGContext) fRGContext(rhs.fRGContext), fOrigFunctionCols(NULL)
{ {
//fGroupByCols.clear(); //fGroupByCols.clear();
//fFunctionCols.clear(); //fFunctionCols.clear();

2
utils/rowgroup/rowaggregation.h
View File

@ -712,7 +712,7 @@ protected:
static const static_any::any& strTypeId; static const static_any::any& strTypeId;
// For UDAF along with with multiple distinct columns // For UDAF along with with multiple distinct columns
vector<SP_ROWAGG_FUNC_t>* fOrigFunctionCols = NULL; vector<SP_ROWAGG_FUNC_t>* fOrigFunctionCols;
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------