From 14ab4c7543781ac800cfcdc03b9338d05dafd958 Mon Sep 17 00:00:00 2001 From: slguan Date: Sat, 7 Dec 2019 11:45:25 +0800 Subject: [PATCH 1/3] correct static warning --- src/client/src/tscAst.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c index 48e147a337..6e72fa8438 100644 --- a/src/client/src/tscAst.c +++ b/src/client/src/tscAst.c @@ -108,12 +108,12 @@ static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols, return NULL; } - int32_t i = 0; size_t nodeSize = sizeof(tSQLSyntaxNode); tSQLSyntaxNode *pNode = NULL; if (pToken->type == TK_ID || pToken->type == TK_TBNAME) { if (pToken->type == TK_ID) { + int32_t i = 0; do { size_t len = strlen(pSchema[i].name); if (strncmp(pToken->z, pSchema[i].name, pToken->n) == 0 && pToken->n == len) break; @@ -268,8 +268,8 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha } // get the operator of expr - uint8_t optr = getBinaryExprOptr(&t0); - if (optr <= 0) { + uint8_t optr = getBinaryExprOptr(&t0); + if (optr == 0) { pError("not support binary operator:%d", t0.type); tSQLSyntaxNodeDestroy(pLeft, NULL); return NULL; @@ -323,10 +323,11 @@ static tSQLSyntaxNode *createSyntaxTree(SSchema *pSchema, int32_t numOfCols, cha pn->colId = -1; return pn; } else { - uint8_t localOptr = getBinaryExprOptr(&t0); - if (localOptr <= 0) { + uint8_t localOptr = getBinaryExprOptr(&t0); + if (localOptr == 0) { pError("not support binary operator:%d", t0.type); return NULL; + free(pBinExpr) } return parseRemainStr(str, pBinExpr, pSchema, localOptr, numOfCols, i); @@ -418,16 +419,17 @@ void tSQLBinaryExprToString(tSQLBinaryExpr *pExpr, char *dst, int32_t *len) { if (pExpr == NULL) { *dst = 0; *len = 0; + return; } - int32_t lhs = tSQLBinaryExprToStringImpl(pExpr->pLeft, dst, pExpr->pLeft->nodeType); + int32_t lhs = tSQLBinaryExprToStringImpl(pExpr->pLeft, dst, pExpr->pLeft->nodeType); dst += lhs; *len = lhs; - char *start = tSQLOptrToString(pExpr->nSQLBinaryOptr, dst); + char *start = tSQLOptrToString(pExpr->nSQLBinaryOptr, dst); *len += (start - dst); - *len += tSQLBinaryExprToStringImpl(pExpr->pRight, start, pExpr->pRight->nodeType); + *len += tSQLBinaryExprToStringImpl(pExpr->pRight, start, pExpr->pRight->nodeType); } static void UNUSED_FUNC destroySyntaxTree(tSQLSyntaxNode *pNode) { tSQLSyntaxNodeDestroy(pNode, NULL); } @@ -650,7 +652,8 @@ void tSQLListTraverseOnResult(struct tSQLBinaryExpr *pExpr, bool (*fp)(tSkipList // brutal force search int64_t num = pResult->num; for (int32_t i = 0, j = 0; i < pResult->num; ++i) { - if (fp == NULL || (fp != NULL && fp(pResult->pRes[i], pExpr->info) == true)) { + //if (fp == NULL || (fp != NULL && fp(pResult->pRes[i], pExpr->info) == true)) { + if (fp == NULL || (fp(pResult->pRes[i], pExpr->info) == true)) { pResult->pRes[j++] = pResult->pRes[i]; } else { num--; From 90b9967d6eaa0cfa0b50418660afc47e1fbb690c Mon Sep 17 00:00:00 2001 From: fang Date: Sat, 7 Dec 2019 14:58:01 +0800 Subject: [PATCH 2/3] correct static error, deference a null pointer --- src/client/src/tscAsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c index abf91e7c43..48dce90714 100644 --- a/src/client/src/tscAsync.c +++ b/src/client/src/tscAsync.c @@ -157,7 +157,7 @@ static void tscProcessAsyncRetrieveImpl(void *param, TAOS_RES *tres, int numOfRo SSqlObj *pSql = (SSqlObj *)tres; if (pSql == NULL) { // error tscError("sql object is NULL"); - tscQueueAsyncError(pSql->fetchFp, param); + tscQueueAsyncError(pSql->fetchFp, param); // fang pSql==NULL return; } From a42cf81e8625cf5f49544603ea76b97671f9381e Mon Sep 17 00:00:00 2001 From: fang Date: Sat, 7 Dec 2019 15:02:24 +0800 Subject: [PATCH 3/3] correct static error, deference a null pointer --- src/client/src/tscAsync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c index 48dce90714..61db9602cf 100644 --- a/src/client/src/tscAsync.c +++ b/src/client/src/tscAsync.c @@ -157,7 +157,6 @@ static void tscProcessAsyncRetrieveImpl(void *param, TAOS_RES *tres, int numOfRo SSqlObj *pSql = (SSqlObj *)tres; if (pSql == NULL) { // error tscError("sql object is NULL"); - tscQueueAsyncError(pSql->fetchFp, param); // fang pSql==NULL return; }