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

fix: return value

This commit is contained in:
factosea 2024-12-16 06:20:10 +08:00
parent eee8b99819
commit a65825b88d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/libs/scalar/src/filter.c
View File

@ -5159,44 +5159,45 @@ static int32_t fltSclProcessCNF(SFilterInfo *pInfo, SArray *sclOpListCNF, SArray
for (int32_t i = 0; i < sz; ++i) { for (int32_t i = 0; i < sz; ++i) {
SFltSclOperator *sclOper = taosArrayGet(sclOpListCNF, i); SFltSclOperator *sclOper = taosArrayGet(sclOpListCNF, i);
if (NULL == sclOper) { if (NULL == sclOper) {
FLT_ERR_RET(TSDB_CODE_OUT_OF_RANGE); FLT_ERR_JRET(TSDB_CODE_OUT_OF_RANGE);
} }
SFltSclColumnRange *colRange = NULL; SFltSclColumnRange *colRange = NULL;
FLT_ERR_RET(fltSclGetOrCreateColumnRange(sclOper->colNode, colRangeList, &colRange)); FLT_ERR_JRET(fltSclGetOrCreateColumnRange(sclOper->colNode, colRangeList, &colRange));
SArray *points = taosArrayInit(4, sizeof(SFltSclPoint)); SArray *points = taosArrayInit(4, sizeof(SFltSclPoint));
if (NULL == points) { if (NULL == points) {
FLT_ERR_RET(terrno); FLT_ERR_JRET(terrno);
} }
FLT_ERR_RET(fltSclBuildRangePoints(sclOper, points)); FLT_ERR_JRET(fltSclBuildRangePoints(sclOper, points));
if (taosArrayGetSize(colRange->points) != 0) { if (taosArrayGetSize(colRange->points) != 0) {
SArray *merged = taosArrayInit(4, sizeof(SFltSclPoint)); SArray *merged = taosArrayInit(4, sizeof(SFltSclPoint));
if (NULL == merged) { if (NULL == merged) {
FLT_ERR_RET(terrno); FLT_ERR_JRET(terrno);
} }
FLT_ERR_RET(fltSclIntersect(colRange->points, points, merged)); FLT_ERR_JRET(fltSclIntersect(colRange->points, points, merged));
taosArrayDestroy(colRange->points); taosArrayDestroy(colRange->points);
taosArrayDestroy(points); taosArrayDestroy(points);
colRange->points = merged; colRange->points = merged;
if(merged->size == 0) { if(merged->size == 0) {
goto _exit; goto _return;
} }
} else { } else {
taosArrayDestroy(colRange->points); taosArrayDestroy(colRange->points);
colRange->points = points; colRange->points = points;
} }
if (sclOper->type == OP_TYPE_IN) { if (sclOper->type == OP_TYPE_IN) {
fltInOpertoArray(&sclInOper, sclOper); code = fltInOpertoArray(&sclInOper, sclOper);
FLT_ERR_JRET(code);
} }
} }
bool hasInOper = false; bool hasInOper = false;
code = hasValidInOper(sclInOper, colRangeList, &hasInOper); code = hasValidInOper(sclInOper, colRangeList, &hasInOper);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
goto _exit; goto _return;
} }
if (hasInOper) { if (hasInOper) {
pInfo->isStrict = false; pInfo->isStrict = false;
} }
_exit: _return:
if (sclInOper) { if (sclInOper) {
taosArrayDestroy(sclInOper); taosArrayDestroy(sclInOper);
} }