database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-523 fix a merge issue, MEDIAN test for empty set.

Browse Source
This commit is contained in:
David Hall
2017-08-02 12:12:00 -05:00
parent f85b3c655a
commit f428cdc371
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/joblist/tupleaggregatestep.cpp
View File

@@ -4212,7 +4212,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
f->fInputColumnIndex, f->fInputColumnIndex,
f->fOutputColumnIndex, f->fOutputColumnIndex,
f->fAuxColumnIndex)); f->fAuxColumnIndex));
functionSub2.push_back(funct); functionSub2.push_back(funct);
}
} }
} }
} }

5
utils/udfsdk/median.cpp
View File

@@ -165,6 +165,11 @@ mcsv1_UDAF::ReturnCode median::evaluate(mcsv1Context* context, static_any::any&
{ {
uint64_t cnt1=0, cnt2=0; uint64_t cnt1=0, cnt2=0;
MEDIAN_DATA& data = static_cast<MedianData*>(context->getUserData())->mData; MEDIAN_DATA& data = static_cast<MedianData*>(context->getUserData())->mData;
if (data.size() == 0)
{
valOut = (DATATYPE)0;
return mcsv1_UDAF::SUCCESS;
}
MEDIAN_DATA::iterator iter(data.begin()); MEDIAN_DATA::iterator iter(data.begin());
MEDIAN_DATA::iterator revfrom(data.end()); MEDIAN_DATA::iterator revfrom(data.end());
MEDIAN_DATA::reverse_iterator riter(revfrom); MEDIAN_DATA::reverse_iterator riter(revfrom);