diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index ded40f75234407e90aa02c68c25d5979e33e020e..25e54fc5c428fb1d26fc7c9d2815048fa43536ad 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -1331,32 +1331,6 @@ static int32_t rewriteCountStar(STranslateContext* pCxt, SFunctionNode* pCount) return code; } -static bool isCountNotNullValue(SFunctionNode* pFunc) { - if (FUNCTION_TYPE_COUNT != pFunc->funcType || 1 != LIST_LENGTH(pFunc->pParameterList)) { - return false; - } - SNode* pPara = nodesListGetNode(pFunc->pParameterList, 0); - return (QUERY_NODE_VALUE == nodeType(pPara) && !((SValueNode*)pPara)->isNull); -} - -// count(1) is rewritten as count(ts) for scannning optimization -static int32_t rewriteCountNotNullValue(STranslateContext* pCxt, SFunctionNode* pCount) { - SValueNode* pValue = (SValueNode*)nodesListGetNode(pCount->pParameterList, 0); - STableNode* pTable = NULL; - int32_t code = findTable(pCxt, NULL, &pTable); - if (TSDB_CODE_SUCCESS == code) { - SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN); - if (NULL == pCol) { - code = TSDB_CODE_OUT_OF_MEMORY; - } else { - setColumnInfoBySchema((SRealTableNode*)pTable, ((SRealTableNode*)pTable)->pMeta->schema, -1, pCol); - NODES_DESTORY_LIST(pCount->pParameterList); - code = nodesListMakeAppend(&pCount->pParameterList, (SNode*)pCol); - } - } - return code; -} - static bool isCountTbname(SFunctionNode* pFunc) { if (FUNCTION_TYPE_COUNT != pFunc->funcType || 1 != LIST_LENGTH(pFunc->pParameterList)) { return false; @@ -1422,9 +1396,6 @@ static int32_t translateAggFunc(STranslateContext* pCxt, SFunctionNode* pFunc) { if (isCountStar(pFunc)) { return rewriteCountStar(pCxt, pFunc); } - if (isCountNotNullValue(pFunc)) { - return rewriteCountNotNullValue(pCxt, pFunc); - } if (isCountTbname(pFunc)) { return rewriteCountTbname(pCxt, pFunc); }