database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +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

13
utils/regr/corr.cpp
View File

@@ -143,6 +143,17 @@ mcsv1_UDAF::ReturnCode corr::subEvaluate(mcsv1Context* context, const UserData*
long double inCxy = inData->cxy; long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt; uint64_t resCnt = inCnt + outCnt;
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 deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy; long double deltay = outAvgy - inAvgy;
@@ -160,7 +171,7 @@ mcsv1_UDAF::ReturnCode corr::subEvaluate(mcsv1Context* context, const UserData*
outData->vary = resVary; outData->vary = resVary;
outData->cxy = resCxy; outData->cxy = resCxy;
outData->cnt = resCnt; outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS; return mcsv1_UDAF::SUCCESS;
} }

11
utils/regr/covar_pop.cpp
View File

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

11
utils/regr/covar_samp.cpp
View File

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

12
utils/regr/regr_intercept.cpp
View File

@@ -136,6 +136,16 @@ mcsv1_UDAF::ReturnCode regr_intercept::subEvaluate(mcsv1Context* context, const
long double inCxy = inData->cxy; long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt; uint64_t resCnt = inCnt + outCnt;
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 deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy; long double deltay = outAvgy - inAvgy;
@@ -151,7 +161,7 @@ mcsv1_UDAF::ReturnCode regr_intercept::subEvaluate(mcsv1Context* context, const
outData->cx = resCx; outData->cx = resCx;
outData->cxy = resCxy; outData->cxy = resCxy;
outData->cnt = resCnt; outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS; return mcsv1_UDAF::SUCCESS;
} }

13
utils/regr/regr_r2.cpp
View File

@@ -142,6 +142,17 @@ mcsv1_UDAF::ReturnCode regr_r2::subEvaluate(mcsv1Context* context, const UserDat
long double inCxy = inData->cxy; long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt; uint64_t resCnt = inCnt + outCnt;
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 deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy; long double deltay = outAvgy - inAvgy;
@@ -159,7 +170,7 @@ mcsv1_UDAF::ReturnCode regr_r2::subEvaluate(mcsv1Context* context, const UserDat
outData->vary = resVary; outData->vary = resVary;
outData->cxy = resCxy; outData->cxy = resCxy;
outData->cnt = resCnt; outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS; return mcsv1_UDAF::SUCCESS;
} }

12
utils/regr/regr_slope.cpp
View File

@@ -134,6 +134,16 @@ mcsv1_UDAF::ReturnCode regr_slope::subEvaluate(mcsv1Context* context, const User
long double inCxy = inData->cxy; long double inCxy = inData->cxy;
uint64_t resCnt = inCnt + outCnt; uint64_t resCnt = inCnt + outCnt;
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 deltax = outAvgx - inAvgx;
long double deltay = outAvgy - inAvgy; long double deltay = outAvgy - inAvgy;
@@ -149,7 +159,7 @@ mcsv1_UDAF::ReturnCode regr_slope::subEvaluate(mcsv1Context* context, const User
outData->cx = resCx; outData->cx = resCx;
outData->cxy = resCxy; outData->cxy = resCxy;
outData->cnt = resCnt; outData->cnt = resCnt;
}
return mcsv1_UDAF::SUCCESS; return mcsv1_UDAF::SUCCESS;
} }

10
utils/regr/regr_sxx.cpp
View File

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

11
utils/regr/regr_sxy.cpp
View File

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

10
utils/regr/regr_syy.cpp
View File

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