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

MCOL-1985 Server set decimal count for UDF based on both parameters. This doesn't work for regr_avgx and regr_avgy, which only care about one of them. Do our best to handle it reasonably. Still gives unlimited decimals for InnoDB when the unused parameter is not numeric.

Browse Source
This commit is contained in:
David Hall
2019-04-23 15:41:20 -05:00
parent b38f192e2e
commit 2b9f54d682
15 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/regr/corr.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the corr function * Columnstore interface for for the corr function
* *
* *
* CREATE AGGREGATE FUNCTION corr returns REAL * CREATE AGGREGATE FUNCTION corr returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_corr #ifndef HEADER_corr

3
utils/regr/covar_pop.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the covar_pop function * Columnstore interface for for the covar_pop function
* *
* *
* CREATE AGGREGATE FUNCTION covar_pop returns REAL * CREATE AGGREGATE FUNCTION covar_pop returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_covar_pop #ifndef HEADER_covar_pop

3
utils/regr/covar_samp.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the covar_samp function * Columnstore interface for for the covar_samp function
* *
* *
* CREATE AGGREGATE FUNCTION covar_samp returns REAL * CREATE AGGREGATE FUNCTION covar_samp returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_covar_samp #ifndef HEADER_covar_samp

7
utils/regr/regr_avgx.cpp
View File

@ -63,13 +63,6 @@ mcsv1_UDAF::ReturnCode regr_avgx::init(mcsv1Context* context,
context->setErrorMessage("regr_avgx() with a non-numeric x argument"); context->setErrorMessage("regr_avgx() with a non-numeric x argument");
return mcsv1_UDAF::ERROR; return mcsv1_UDAF::ERROR;
} }
if (!(isNumeric(colTypes[1].dataType)))
{
// The error message will be prepended with
// "The storage engine for the table doesn't support "
context->setErrorMessage("regr_avgx() with a non-numeric independant (second) argument");
return mcsv1_UDAF::ERROR;
}
context->setUserDataSize(sizeof(regr_avgx_data)); context->setUserDataSize(sizeof(regr_avgx_data));
context->setResultType(CalpontSystemCatalog::DOUBLE); context->setResultType(CalpontSystemCatalog::DOUBLE);

3
utils/regr/regr_avgx.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_avgx function * Columnstore interface for for the regr_avgx function
* *
* *
* CREATE AGGREGATE FUNCTION regr_avgx returns REAL soname * CREATE AGGREGATE FUNCTION regr_avgx returns REAL soname 'libregr_mysql.so';
* 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_avgx #ifndef HEADER_regr_avgx

9
utils/regr/regr_avgy.cpp
View File

@ -60,14 +60,7 @@ mcsv1_UDAF::ReturnCode regr_avgy::init(mcsv1Context* context,
{ {
// The error message will be prepended with // The error message will be prepended with
// "The storage engine for the table doesn't support " // "The storage engine for the table doesn't support "
context->setErrorMessage("regr_avgy() with a non-numeric x argument"); context->setErrorMessage("regr_avgy() with a non-numeric y argument");
return mcsv1_UDAF::ERROR;
}
if (!(isNumeric(colTypes[0].dataType)))
{
// The error message will be prepended with
// "The storage engine for the table doesn't support "
context->setErrorMessage("regr_avgy() with a non-numeric dependant (first) argument");
return mcsv1_UDAF::ERROR; return mcsv1_UDAF::ERROR;
} }

3
utils/regr/regr_avgy.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_avgy function * Columnstore interface for for the regr_avgy function
* *
* *
* CREATE AGGREGATE FUNCTION regr_avgy returns REAL soname * CREATE AGGREGATE FUNCTION regr_avgy returns REAL soname 'libregr_mysql.so';
* 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_avgy #ifndef HEADER_regr_avgy

3
utils/regr/regr_count.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_count function * Columnstore interface for for the regr_count function
* *
* *
* CREATE AGGREGATE FUNCTION regr_count returns INTEGER * CREATE AGGREGATE FUNCTION regr_count returns INTEGER soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_count #ifndef HEADER_regr_count

3
utils/regr/regr_intercept.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_intercept function * Columnstore interface for for the regr_intercept function
* *
* *
* CREATE AGGREGATE FUNCTION regr_intercept returns REAL * CREATE AGGREGATE FUNCTION regr_intercept returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_intercept #ifndef HEADER_regr_intercept

3
utils/regr/regr_r2.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_r2 function * Columnstore interface for for the regr_r2 function
* *
* *
* CREATE AGGREGATE FUNCTION regr_r2 returns REAL * CREATE AGGREGATE FUNCTION regr_r2 returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_r2 #ifndef HEADER_regr_r2

3
utils/regr/regr_slope.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_slope function * Columnstore interface for for the regr_slope function
* *
* *
* CREATE AGGREGATE FUNCTION regr_slope returns REAL * CREATE AGGREGATE FUNCTION regr_slope returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_slope #ifndef HEADER_regr_slope

3
utils/regr/regr_sxx.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_sxx function * Columnstore interface for for the regr_sxx function
* *
* *
* CREATE AGGREGATE FUNCTION regr_sxx returns REAL * CREATE AGGREGATE FUNCTION regr_sxx returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_sxx #ifndef HEADER_regr_sxx

3
utils/regr/regr_sxy.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_sxy function * Columnstore interface for for the regr_sxy function
* *
* *
* CREATE AGGREGATE FUNCTION regr_sxy returns REAL * CREATE AGGREGATE FUNCTION regr_sxy returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_sxy #ifndef HEADER_regr_sxy

3
utils/regr/regr_syy.h
View File

@ -25,8 +25,7 @@
* Columnstore interface for for the regr_syy function * Columnstore interface for for the regr_syy function
* *
* *
* CREATE AGGREGATE FUNCTION regr_syy returns REAL * CREATE AGGREGATE FUNCTION regr_syy returns REAL soname 'libregr_mysql.so';
* soname 'libregr_mysql.so';
* *
*/ */
#ifndef HEADER_regr_syy #ifndef HEADER_regr_syy

17
utils/regr/regrmysql.cpp
View File

@ -167,10 +167,13 @@ extern "C"
strcpy(message,"regr_avgx() with a non-numeric independant (second) argument"); strcpy(message,"regr_avgx() with a non-numeric independant (second) argument");
return 1; return 1;
} }
if (args->arg_type[1] == DECIMAL_RESULT && initid->decimals != DECIMAL_NOT_SPECIFIED)
if (initid->decimals != DECIMAL_NOT_SPECIFIED)
{ {
initid->decimals +=4; initid->decimals += 4;
}
else
{
initid->decimals = DECIMAL_NOT_SPECIFIED;
} }
if (!(data = (struct regr_avgx_data*) malloc(sizeof(struct regr_avgx_data)))) if (!(data = (struct regr_avgx_data*) malloc(sizeof(struct regr_avgx_data))))
@ -272,9 +275,13 @@ extern "C"
return 1; return 1;
} }
if (initid->decimals != DECIMAL_NOT_SPECIFIED) if (args->arg_type[0] == DECIMAL_RESULT && initid->decimals != DECIMAL_NOT_SPECIFIED)
{ {
initid->decimals +=4; initid->decimals += 4;
}
else
{
initid->decimals = DECIMAL_NOT_SPECIFIED;
} }
if (!(data = (struct regr_avgy_data*) malloc(sizeof(struct regr_avgy_data)))) if (!(data = (struct regr_avgy_data*) malloc(sizeof(struct regr_avgy_data))))