[td-2819] refactor codes and fix memory leak

src/client/src/tscUtil.c

@@ -2027,6 +2027,9 @@ static void freeQueryInfoImpl(SQueryInfo* pQueryInfo) {
 
   tfree(pQueryInfo->fillVal);
   tfree(pQueryInfo->buf);
+
+  taosArrayDestroy(pQueryInfo->pUpstream);
+  taosArrayDestroy(pQueryInfo->pDownstream);
 }
 
 void tscClearSubqueryInfo(SSqlCmd* pCmd) {
@@ -3183,7 +3186,7 @@ int32_t tscCreateQueryFromQueryInfo(SQueryInfo* pQueryInfo, SQueryAttr* pQueryAt
 
   STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[0];
 
-  pQueryAttr->pGroupbyExpr   = calloc(1, sizeof(SSqlGroupbyExpr));
+  pQueryAttr->pGroupbyExpr    = calloc(1, sizeof(SSqlGroupbyExpr));
   *(pQueryAttr->pGroupbyExpr) = pQueryInfo->groupbyExpr;
 
   pQueryAttr->pExpr1 = calloc(pQueryAttr->numOfOutput, sizeof(SExprInfo));

src/query/inc/qExecutor.h

@@ -467,6 +467,7 @@ size_t getResultSize(SQInfo *pQInfo, int64_t *numOfRows);
 void setQueryKilled(SQInfo *pQInfo);
 void queryCostStatis(SQInfo *pQInfo);
 void freeQInfo(SQInfo *pQInfo);
+void freeQueryAttr(SQueryAttr *pQuery);
 
 int32_t getMaximumIdleDurationSec();
 

src/query/src/qExecutor.c

@@ -6486,13 +6486,13 @@ void freeQInfo(SQInfo *pQInfo) {
     }
   }
 
+  tsdbDestroyTableGroup(&pQueryAttr->tableGroupInfo);
+
   doDestroyTableQueryInfo(&pRuntimeEnv->tableqinfoGroupInfo);
 
   tfree(pQInfo->pBuf);
   tfree(pQInfo->sql);
 
-  tsdbDestroyTableGroup(&pQueryAttr->tableGroupInfo);
-
   taosArrayDestroy(pRuntimeEnv->groupResInfo.pRows);
   pQInfo->signature = 0;
 
@@ -6639,3 +6639,38 @@ void releaseQueryBuf(size_t numOfTables) {
   // restore value is not enough buffer available
   atomic_add_fetch_64(&tsQueryBufferSizeBytes, t);
 }
+
+void freeQueryAttr(SQueryAttr* pQueryAttr) {
+  if (pQueryAttr != NULL) {
+    if (pQueryAttr->fillVal != NULL) {
+      tfree(pQueryAttr->fillVal);
+    }
+
+    for (int32_t i = 0; i < pQueryAttr->numOfFilterCols; ++i) {
+      SSingleColumnFilterInfo* pColFilter = &pQueryAttr->pFilterInfo[i];
+      if (pColFilter->numOfFilters > 0) {
+        tfree(pColFilter->pFilters);
+      }
+    }
+
+    pQueryAttr->pExpr1 = destroyQueryFuncExpr(pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
+    pQueryAttr->pExpr2 = destroyQueryFuncExpr(pQueryAttr->pExpr2, pQueryAttr->numOfExpr2);
+
+    tfree(pQueryAttr->tagColList);
+    tfree(pQueryAttr->pFilterInfo);
+
+    if (pQueryAttr->colList != NULL) {
+      for (int32_t i = 0; i < pQueryAttr->numOfCols; i++) {
+        SColumnInfo* column = pQueryAttr->colList + i;
+        freeColumnFilterInfo(column->filterInfo, column->numOfFilters);
+      }
+      tfree(pQueryAttr->colList);
+    }
+
+    if (pQueryAttr->pGroupbyExpr != NULL) {
+      taosArrayDestroy(pQueryAttr->pGroupbyExpr->columnInfo);
+      tfree(pQueryAttr->pGroupbyExpr);
+    }
+  }
+}
+