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

fix: fix minior bugs

This commit is contained in:
slzhou 2023-05-23 16:36:27 +08:00
parent 857cf3d269
commit 22616d235a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3598,7 +3598,7 @@ int32_t fltSclMerge(SArray *pts1, SArray *pts2, bool isUnion, SArray *merged) {
int32_t countRequired = (isUnion) ? 1 : 2; int32_t countRequired = (isUnion) ? 1 : 2;
int32_t count = 0; int32_t count = 0;
for (int32_t i = 0; i < taosArrayGetSize(all); ++i) { for (int32_t i = 0; i < taosArrayGetSize(all); ++i) {
SFltSclPoint *pt = taosArrayGet(pts1, i); SFltSclPoint *pt = taosArrayGet(all, i);
if (pt->start) { if (pt->start) {
++count; ++count;
if (count == countRequired) { if (count == countRequired) {
@ -4402,7 +4402,9 @@ static int32_t fltSclCollectOperatorFromNode(SNode *pNode, SArray *sclOpList) {
SValueNode *valNode = (SValueNode *)pOper->pRight; SValueNode *valNode = (SValueNode *)pOper->pRight;
if (IS_NUMERIC_TYPE(valNode->node.resType.type) || valNode->node.resType.type == TSDB_DATA_TYPE_TIMESTAMP) { if (IS_NUMERIC_TYPE(valNode->node.resType.type) || valNode->node.resType.type == TSDB_DATA_TYPE_TIMESTAMP) {
SFltSclOperator sclOp = { SFltSclOperator sclOp = {
.colNode = (SColumnNode*)nodesCloneNode(pOper->pLeft), .valNode = (SValueNode*)nodesCloneNode(pOper->pRight), .type = pOper->opType}; .colNode = (SColumnNode*)nodesCloneNode(pOper->pLeft),
.valNode = (SValueNode*)nodesCloneNode(pOper->pRight),
.type = pOper->opType};
taosArrayPush(sclOpList, &sclOp); taosArrayPush(sclOpList, &sclOp);
} }
} }
@ -4433,7 +4435,7 @@ static int32_t fltSclCollectOperators(SNode *pNode, SArray *sclOpList) {
} }
int32_t fltOptimizeNodes(SFilterInfo *pInfo, SNode **pNode, SFltTreeStat *pStat) { int32_t fltOptimizeNodes(SFilterInfo *pInfo, SNode **pNode, SFltTreeStat *pStat) {
SArray *sclOpList = taosArrayInit(16, POINTER_BYTES); SArray *sclOpList = taosArrayInit(16, sizeof(SFltSclOperator));
fltSclCollectOperators(*pNode, sclOpList); fltSclCollectOperators(*pNode, sclOpList);
SArray *colRangeList = taosArrayInit(16, sizeof(SFltSclColumnRange)); SArray *colRangeList = taosArrayInit(16, sizeof(SFltSclColumnRange));
fltSclProcessCNF(sclOpList, colRangeList); fltSclProcessCNF(sclOpList, colRangeList);