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

MCOL-1793 Add udafContext to the copy constructor of WindowFunctionColumn.

Browse Source
This commit is contained in:
David Hall
2018-11-23 12:42:29 -06:00
parent 3709fe92a5
commit 176ef2f2c1
32 changed files with 6575 additions and 6574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/execplan/windowfunctioncolumn.cpp
View File

@ -233,7 +233,8 @@ WindowFunctionColumn::WindowFunctionColumn( const WindowFunctionColumn& rhs, con
fFunctionName(rhs.functionName()), fFunctionName(rhs.functionName()),
fFunctionParms(rhs.functionParms()), fFunctionParms(rhs.functionParms()),
fPartitions (rhs.partitions()), fPartitions (rhs.partitions()),
fOrderBy (rhs.orderBy()) fOrderBy (rhs.orderBy()),
udafContext(rhs.getUDAFContext())
{} {}
const string WindowFunctionColumn::toString() const const string WindowFunctionColumn::toString() const

4
dbcon/execplan/windowfunctioncolumn.h
View File

@ -140,6 +140,10 @@ public:
{ {
return udafContext; return udafContext;
} }
const mcsv1sdk::mcsv1Context& getUDAFContext() const
{
return udafContext;
}
private: private:
/** /**

3
genii.vpw
View File

@ -4,12 +4,9 @@
<Project File="tools/configMgt/autoConfigure.vpj"/> <Project File="tools/configMgt/autoConfigure.vpj"/>
<Project File="utils/batchloader/batchloader.vpj"/> <Project File="utils/batchloader/batchloader.vpj"/>
<Project File="primitives/blockcache/blockcache.vpj"/> <Project File="primitives/blockcache/blockcache.vpj"/>
<Project File="utils/boost_idb/boost_idb.vpj"/>
<Project File="versioning/BRM/brm.vpj"/> <Project File="versioning/BRM/brm.vpj"/>
<Project File="writeengine/bulk/bulk.vpj"/> <Project File="writeengine/bulk/bulk.vpj"/>
<Project File="utils/cacheutils/cacheutils.vpj"/> <Project File="utils/cacheutils/cacheutils.vpj"/>
<Project File="oamapps/calpont-console/calpontConsole.vpj"/>
<Project File="oamapps/calpontDB/calpontDBWrite.vpj"/>
<Project File="tools/dbloadxml/colxml.vpj"/> <Project File="tools/dbloadxml/colxml.vpj"/>
<Project File="utils/common/common.vpj"/> <Project File="utils/common/common.vpj"/>
<Project File="utils/compress/compress.vpj"/> <Project File="utils/compress/compress.vpj"/>

9
utils/regr/regr_intercept.cpp
View File

@ -145,13 +145,12 @@ mcsv1_UDAF::ReturnCode regr_intercept::evaluate(mcsv1Context* context, static_an
double sumy = data->sumy; double sumy = data->sumy;
double sumx2 = data->sumx2; double sumx2 = data->sumx2;
double sumxy = data->sumxy; double sumxy = data->sumxy;
double slope = 0; double numerator = sumy * sumx2 - sumx * sumxy;
double variance = (N * sumx2) - (sumx * sumx); double var_pop = (N * sumx2) - (sumx * sumx);
if (variance != 0) if (var_pop != 0)
{ {
slope = ((N * sumxy) - (sumx * sumy)) / variance; valOut = numerator / var_pop;
} }
valOut = (sumy - (slope * sumx)) / N;
} }
return mcsv1_UDAF::SUCCESS; return mcsv1_UDAF::SUCCESS;
} }