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

fix: (errcode) geom return value

This commit is contained in:
Shungang Li 2024-07-24 19:27:52 +08:00
parent d908c1d710
commit 12f9116eeb
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/libs/geometry/src/geomFunc.c
View File

@ -203,8 +203,6 @@ int32_t executeRelationFunc(const GEOSGeometry *geom1, const GEOSPreparedGeometr
int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomInitCtxFunc_t initCtxFn, int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomInitCtxFunc_t initCtxFn,
_geomExecuteOneParamFunc_t executeOneParamFn) { _geomExecuteOneParamFunc_t executeOneParamFn) {
int32_t code = TSDB_CODE_FAILED;
TAOS_CHECK_RETURN(initCtxFn()); TAOS_CHECK_RETURN(initCtxFn());
SColumnInfoData *pInputData = pInput->columnData; SColumnInfoData *pInputData = pInput->columnData;
@ -213,12 +211,10 @@ int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomI
if (IS_NULL_TYPE(GET_PARAM_TYPE(pInput))) { if (IS_NULL_TYPE(GET_PARAM_TYPE(pInput))) {
colDataSetNNULL(pOutputData, 0, pInput->numOfRows); colDataSetNNULL(pOutputData, 0, pInput->numOfRows);
code = TSDB_CODE_SUCCESS;
} else { } else {
for (int32_t i = 0; i < pInput->numOfRows; ++i) { for (int32_t i = 0; i < pInput->numOfRows; ++i) {
if (colDataIsNull_s(pInputData, i)) { if (colDataIsNull_s(pInputData, i)) {
colDataSetNULL(pOutputData, i); colDataSetNULL(pOutputData, i);
code = TSDB_CODE_SUCCESS;
continue; continue;
} }
@ -226,13 +222,11 @@ int32_t geomOneParamFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomI
} }
} }
TAOS_RETURN(code); TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomInitCtxFunc_t initCtxFn, int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, _geomInitCtxFunc_t initCtxFn,
_geomExecuteTwoParamsFunc_t executeTwoParamsFn) { _geomExecuteTwoParamsFunc_t executeTwoParamsFn) {
int32_t code = TSDB_CODE_FAILED;
TAOS_CHECK_RETURN(initCtxFn()); TAOS_CHECK_RETURN(initCtxFn());
SColumnInfoData *pInputData[2]; SColumnInfoData *pInputData[2];
@ -250,7 +244,6 @@ int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, _geom
(isConstantLeft && colDataIsNull_s(pInputData[0], 0)) || // left operand is constant NULL (isConstantLeft && colDataIsNull_s(pInputData[0], 0)) || // left operand is constant NULL
(isConstantRight && colDataIsNull_s(pInputData[1], 0))) { // right operand is constant NULL (isConstantRight && colDataIsNull_s(pInputData[1], 0))) { // right operand is constant NULL
colDataSetNNULL(pOutputData, 0, numOfRows); colDataSetNNULL(pOutputData, 0, numOfRows);
code = TSDB_CODE_SUCCESS;
} else { } else {
int32_t iLeft = 0; int32_t iLeft = 0;
int32_t iRight = 0; int32_t iRight = 0;
@ -261,7 +254,6 @@ int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, _geom
if ((!isConstantLeft && colDataIsNull_s(pInputData[0], iLeft)) || if ((!isConstantLeft && colDataIsNull_s(pInputData[0], iLeft)) ||
(!isConstantRight && colDataIsNull_s(pInputData[1], iRight))) { (!isConstantRight && colDataIsNull_s(pInputData[1], iRight))) {
colDataSetNULL(pOutputData, i); colDataSetNULL(pOutputData, i);
code = TSDB_CODE_SUCCESS;
continue; continue;
} }
@ -269,7 +261,7 @@ int32_t geomTwoParamsFunction(SScalarParam *pInput, SScalarParam *pOutput, _geom
} }
} }
TAOS_RETURN(code); TAOS_RETURN(TSDB_CODE_SUCCESS);
} }
int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput, bool swapAllowed, int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput, bool swapAllowed,
@ -324,7 +316,6 @@ int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput, bool s
for (int32_t i = 0; i < numOfRows; ++i) { for (int32_t i = 0; i < numOfRows; ++i) {
if ((!isConstant1 && colDataIsNull_s(pInputData[0], i)) || (!isConstant2 && colDataIsNull_s(pInputData[1], i))) { if ((!isConstant1 && colDataIsNull_s(pInputData[0], i)) || (!isConstant2 && colDataIsNull_s(pInputData[1], i))) {
colDataSetNULL(pOutputData, i); colDataSetNULL(pOutputData, i);
code = TSDB_CODE_SUCCESS;
continue; continue;
} }
@ -346,6 +337,8 @@ int32_t geomRelationFunction(SScalarParam *pInput, SScalarParam *pOutput, bool s
} }
} }
code = TSDB_CODE_SUCCESS;
_exit: _exit:
destroyGeometry(&geom1, &preparedGeom1); destroyGeometry(&geom1, &preparedGeom1);
destroyGeometry(&geom2, NULL); destroyGeometry(&geom2, NULL);