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

fix:[TS-5761] error for in operator

This commit is contained in:
wangmm0220 2024-12-17 10:26:19 +08:00
parent bd6170c03e
commit 2013a822f5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4874,8 +4874,10 @@ EDealRes fltReviseRewriter(SNode **pNode, void *pContext) {
type = tmp; type = tmp;
} }
} }
if (IS_NUMERIC_TYPE(type)){
exprNode->resType.type = type; exprNode->resType.type = type;
} }
}
if ((0 != type && type != refNode->node.resType.type) || OP_TYPE_NOT_IN == node->opType) { if ((0 != type && type != refNode->node.resType.type) || OP_TYPE_NOT_IN == node->opType) {
stat->scalarMode = true; stat->scalarMode = true;
return DEAL_RES_CONTINUE; return DEAL_RES_CONTINUE;

2
source/libs/scalar/src/sclvector.c
View File

@ -1069,7 +1069,7 @@ int32_t vectorGetConvertType(int32_t type1, int32_t type2) {
int32_t vectorConvertSingleCol(SScalarParam *input, SScalarParam *output, int32_t type, int32_t startIndex, int32_t vectorConvertSingleCol(SScalarParam *input, SScalarParam *output, int32_t type, int32_t startIndex,
int32_t numOfRows) { int32_t numOfRows) {
if (input->columnData == NULL && input->pHashFilterVar != NULL){ if (input->columnData == NULL && (input->pHashFilter != NULL || input->pHashFilterVar != NULL)){
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
output->numOfRows = input->numOfRows; output->numOfRows = input->numOfRows;