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

Fix the 0 count problem

Browse Source
This commit is contained in:
mariadb-AndreyPiskunov
2022-09-09 18:48:58 +03:00
committed by Leonid Fedorov
parent 80a2d8e9f5
commit e7cab8445c
9 changed files with 181 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
utils/regr/corr.cpp
View File

@ -143,24 +143,35 @@ mcsv1_UDAF::ReturnCode corr::subEvaluate(mcsv1Context* context, const UserData*
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->varx = 0;
outData->vary = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resVarx = outVarx + inVarx + deltax * deltax * inCnt * outCnt / resCnt;
long double resVary = outVary + inVary + deltay * deltay * inCnt * outCnt / resCnt;
long double resVarx = outVarx + inVarx + deltax * deltax * inCnt * outCnt / resCnt;
long double resVary = outVary + inVary + deltay * deltay * inCnt * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->varx = resVarx;
outData->vary = resVary;
outData->cxy = resCxy;
outData->cnt = resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->varx = resVarx;
outData->vary = resVary;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

29
utils/regr/covar_pop.cpp
View File

@ -123,17 +123,26 @@ mcsv1_UDAF::ReturnCode covar_pop::subEvaluate(mcsv1Context* context, const UserD
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cxy = resCxy;
outData->cnt = resCnt;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

29
utils/regr/covar_samp.cpp
View File

@ -123,17 +123,26 @@ mcsv1_UDAF::ReturnCode covar_samp::subEvaluate(mcsv1Context* context, const User
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cxy = resCxy;
outData->cnt = resCnt;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

34
utils/regr/regr_intercept.cpp
View File

@ -136,22 +136,32 @@ mcsv1_UDAF::ReturnCode regr_intercept::subEvaluate(mcsv1Context* context, const
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->cx = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCx = outCx + inCx + deltax * deltax * inCnt * outCnt / resCnt;
long double resCx = outCx + inCx + deltax * deltax * inCnt * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cx = resCx;
outData->cxy = resCxy;
outData->cnt = resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cx = resCx;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

39
utils/regr/regr_r2.cpp
View File

@ -142,24 +142,35 @@ mcsv1_UDAF::ReturnCode regr_r2::subEvaluate(mcsv1Context* context, const UserDat
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->varx = 0;
outData->vary = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resVarx = outVarx + inVarx + deltax * deltax * inCnt * outCnt / resCnt;
long double resVary = outVary + inVary + deltay * deltay * inCnt * outCnt / resCnt;
long double resVarx = outVarx + inVarx + deltax * deltax * inCnt * outCnt / resCnt;
long double resVary = outVary + inVary + deltay * deltay * inCnt * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->varx = resVarx;
outData->vary = resVary;
outData->cxy = resCxy;
outData->cnt = resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->varx = resVarx;
outData->vary = resVary;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

34
utils/regr/regr_slope.cpp
View File

@ -134,22 +134,32 @@ mcsv1_UDAF::ReturnCode regr_slope::subEvaluate(mcsv1Context* context, const User
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->cx = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCx = outCx + inCx + deltax * deltax * inCnt * outCnt / resCnt;
long double resCx = outCx + inCx + deltax * deltax * inCnt * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cx = resCx;
outData->cxy = resCxy;
outData->cnt = resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cx = resCx;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

22
utils/regr/regr_sxx.cpp
View File

@ -114,16 +114,24 @@ mcsv1_UDAF::ReturnCode regr_sxx::subEvaluate(mcsv1Context* context, const UserDa
long double inCx = inData->cx;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
if (resCnt == 0)
{
outData->avgx = 0;
outData->cx = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resCx = outCx + inCx + deltax * deltax * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->cx = resCx;
outData->cnt = resCnt;
long double resCx = outCx + inCx + deltax * deltax * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->cx = resCx;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

29
utils/regr/regr_sxy.cpp
View File

@ -121,17 +121,26 @@ mcsv1_UDAF::ReturnCode regr_sxy::subEvaluate(mcsv1Context* context, const UserDa
long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt;
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cxy = resCxy;
outData->cnt = resCnt;
if (resCnt == 0)
{
outData->avgx = 0;
outData->avgy = 0;
outData->cxy = 0;
outData->cnt = 0;
}
else
{
long double deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy;
long double resAvgx = inAvgx + deltax * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCxy = outCxy + inCxy + deltax * deltay * inCnt * outCnt / resCnt;
outData->avgx = resAvgx;
outData->avgy = resAvgy;
outData->cxy = resCxy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}

22
utils/regr/regr_syy.cpp
View File

@ -114,16 +114,24 @@ mcsv1_UDAF::ReturnCode regr_syy::subEvaluate(mcsv1Context* context, const UserDa
long double inCy = inData->cy;
uint64_t resCnt = inCnt + outCnt;
long double deltay = outAvgy - inAvgy;
if (resCnt == 0)
{
outData->avgy = 0;
outData->cy = 0;
outData->cnt = 0;
}
else
{
long double deltay = outAvgy - inAvgy;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resAvgy = inAvgy + deltay * outCnt / resCnt;
long double resCy = outCy + inCy + deltay * deltay * inCnt * outCnt / resCnt;
outData->avgy = resAvgy;
outData->cy = resCy;
outData->cnt = resCnt;
long double resCy = outCy + inCy + deltay * deltay * inCnt * outCnt / resCnt;
outData->avgy = resAvgy;
outData->cy = resCy;
outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS;
}