From 80c5a16c282773a9522a8646fa86b09e1bc45961 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 30 Mar 2021 16:24:05 +0800
Subject: [PATCH] [td-2819] refactor codes.

---
 src/client/src/tscUtil.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 1cff6440e0..ff34b23f20 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1273,19 +1273,6 @@ void tscFieldInfoClear(SFieldInfo* pFieldInfo) {
   if (pFieldInfo == NULL) {
     return;
   }
-
-  for(int32_t i = 0; i < pFieldInfo->numOfOutput; ++i) {
-    SInternalField* pInfo = taosArrayGet(pFieldInfo->internalField, i);
-    
-    if (pInfo->pExpr != NULL && pInfo->pExpr->pExpr != NULL) {
-      tExprTreeDestroy(pInfo->pExpr->pExpr, NULL);
-
-      SSqlExpr* pSqlExpr = &pInfo->pExpr->base;
-      for(int32_t j = 0; j < pSqlExpr->numOfParams; ++j) {
-        tVariantDestroy(&pSqlExpr->param[j]);
-      }
-    }
-  }
   
   taosArrayDestroy(pFieldInfo->internalField);
   tfree(pFieldInfo->final);
@@ -1436,6 +1423,10 @@ void* sqlExprDestroy(SExprInfo* pExpr) {
   for(int32_t i = 0; i < tListLen(p->param); ++i) {
     tVariantDestroy(&p->param[i]);
   }
+
+  if (pExpr->pExpr != NULL) {
+    tExprTreeDestroy(pExpr->pExpr, NULL);
+  }
   
   tfree(pExpr);