xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-14240]<feature>: add math functions

This commit is contained in:
Ganlin Zhao 2022-03-26 10:43:57 +08:00
parent aaa2d2094a
commit 8a2623e962
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libs/scalar/src/sclfunc.c
View File

@ -103,7 +103,7 @@ int32_t logFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutpu
char **input = NULL, *output = NULL;
bool hasNullInput = false;
input = calloc(inputNum, sizeof(char *));
input = taosMemoryCalloc(inputNum, sizeof(char *));
for (int32_t i = 0; i < pOutput->num; ++i) {
for (int32_t j = 0; j < inputNum; ++j) {
if (pInput[j].num == 1) {
@ -131,7 +131,7 @@ int32_t logFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutpu
SET_TYPED_DATA(output, pOutput->type, result);
}
free(input);
taosMemoryFree(input);
return TSDB_CODE_SUCCESS;
}
@ -146,7 +146,7 @@ int32_t powFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutpu
char **input = NULL, *output = NULL;
bool hasNullInput = false;
input = calloc(inputNum, sizeof(char *));
input = taosMemoryCalloc(inputNum, sizeof(char *));
for (int32_t i = 0; i < pOutput->num; ++i) {
for (int32_t j = 0; j < inputNum; ++j) {
if (pInput[j].num == 1) {
@ -174,7 +174,7 @@ int32_t powFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutpu
SET_TYPED_DATA(output, pOutput->type, result);
}
free(input);
taosMemoryFree(input);
return TSDB_CODE_SUCCESS;
}

24
source/libs/scalar/test/scalar/scalarTests.cpp
View File

@ -1442,7 +1442,7 @@ TEST(columnTest, greater_and_lower) {
}
void scltMakeDataBlock(SScalarParam **pInput, int32_t type, void *pVal, int32_t num, bool setVal) {
SScalarParam *input = (SScalarParam *)calloc(1, sizeof(SScalarParam));
SScalarParam *input = (SScalarParam *)taosMemoryCalloc(1, sizeof(SScalarParam));
int32_t bytes;
switch (type) {
case TSDB_DATA_TYPE_TINYINT: {
@ -1473,7 +1473,7 @@ void scltMakeDataBlock(SScalarParam **pInput, int32_t type, void *pVal, int32_t
input->type = type;
input->num = num;
input->data = calloc(num, bytes);
input->data = taosMemoryCalloc(num, bytes);
input->bytes = bytes;
if (setVal) {
for (int32_t i = 0; i < num; ++i) {
@ -1487,8 +1487,8 @@ void scltMakeDataBlock(SScalarParam **pInput, int32_t type, void *pVal, int32_t
}
void scltDestroyDataBlock(SScalarParam *pInput) {
free(pInput->data);
free(pInput);
taosMemoryFree(pInput->data);
taosMemoryFree(pInput);
}
TEST(ScalarFunctionTest, absFunction_constant) {
@ -2754,7 +2754,7 @@ TEST(ScalarFunctionTest, logFunction_constant) {
int32_t type;
int32_t otype = TSDB_DATA_TYPE_DOUBLE;
double result = 3.0;
pInput = (SScalarParam *)calloc(2, sizeof(SScalarParam));
pInput = (SScalarParam *)taosMemoryCalloc(2, sizeof(SScalarParam));
//TINYINT
int8_t val_tinyint[] = {27, 3};
@ -2819,7 +2819,7 @@ TEST(ScalarFunctionTest, logFunction_constant) {
scltDestroyDataBlock(input[0]);
scltDestroyDataBlock(input[1]);
scltDestroyDataBlock(pOutput);
free(pInput);
taosMemoryFree(pInput);
}
TEST(ScalarFunctionTest, logFunction_column) {
@ -2830,7 +2830,7 @@ TEST(ScalarFunctionTest, logFunction_column) {
int32_t type;
int32_t otype = TSDB_DATA_TYPE_DOUBLE;
double result[] = {2.0, 4.0, 3.0};
pInput = (SScalarParam *)calloc(2, sizeof(SScalarParam));
pInput = (SScalarParam *)taosMemoryCalloc(2, sizeof(SScalarParam));
//TINYINT
int8_t val_tinyint[2][3] = {{25, 81, 64}, {5, 3, 4}};
@ -2910,7 +2910,7 @@ TEST(ScalarFunctionTest, logFunction_column) {
scltDestroyDataBlock(input[0]);
scltDestroyDataBlock(input[1]);
scltDestroyDataBlock(pOutput);
free(pInput);
taosMemoryFree(pInput);
}
TEST(ScalarFunctionTest, powFunction_constant) {
@ -2921,7 +2921,7 @@ TEST(ScalarFunctionTest, powFunction_constant) {
int32_t type;
int32_t otype = TSDB_DATA_TYPE_DOUBLE;
double result = 16.0;
pInput = (SScalarParam *)calloc(2, sizeof(SScalarParam));
pInput = (SScalarParam *)taosMemoryCalloc(2, sizeof(SScalarParam));
//TINYINT
int8_t val_tinyint[] = {2, 4};
@ -2986,7 +2986,7 @@ TEST(ScalarFunctionTest, powFunction_constant) {
scltDestroyDataBlock(input[0]);
scltDestroyDataBlock(input[1]);
scltDestroyDataBlock(pOutput);
free(pInput);
taosMemoryFree(pInput);
}
TEST(ScalarFunctionTest, powFunction_column) {
@ -2997,7 +2997,7 @@ TEST(ScalarFunctionTest, powFunction_column) {
int32_t type;
int32_t otype = TSDB_DATA_TYPE_DOUBLE;
double result[] = {32.0, 27.0, 16.0};
pInput = (SScalarParam *)calloc(2, sizeof(SScalarParam));
pInput = (SScalarParam *)taosMemoryCalloc(2, sizeof(SScalarParam));
//TINYINT
int8_t val_tinyint[2][3] = {{2, 3, 4}, {5, 3, 2}};
@ -3078,7 +3078,7 @@ TEST(ScalarFunctionTest, powFunction_column) {
scltDestroyDataBlock(input[0]);
scltDestroyDataBlock(input[1]);
scltDestroyDataBlock(pOutput);
free(pInput);
taosMemoryFree(pInput);
}
int main(int argc, char** argv) {