From 97fcf7a73e4d1d08b0a233fce0ecdad1207c86a0 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Mon, 27 Sep 2021 16:04:46 +0800
Subject: [PATCH] TD-6129<feature> add tag-> where logic

---
 src/common/src/texpr.c  | 8 ++++----
 src/query/src/qFilter.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c
index 29fa194b24..e02ac1f954 100644
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
@@ -122,7 +122,7 @@ void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *)) {
     tfree(pNode->pSchema);
   }
 
-  free(pNode);
+  tfree(pNode);
 }
 
 static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) {
@@ -139,12 +139,12 @@ static void doExprTreeDestroy(tExprNode **pExpr, void (*fp)(void *)) {
     }
   } else if ((*pExpr)->nodeType == TSQL_NODE_VALUE) {
     tVariantDestroy((*pExpr)->pVal);
-    free((*pExpr)->pVal);
+    tfree((*pExpr)->pVal);
   } else if ((*pExpr)->nodeType == TSQL_NODE_COL) {
-    free((*pExpr)->pSchema);
+    tfree((*pExpr)->pSchema);
   }
 
-  free(*pExpr);
+  tfree(*pExpr);
   *pExpr = NULL;
 }
 
diff --git a/src/query/src/qFilter.c b/src/query/src/qFilter.c
index d8e1d5ac5d..51ac8654a6 100644
--- a/src/query/src/qFilter.c
+++ b/src/query/src/qFilter.c
@@ -862,8 +862,8 @@ int32_t filterAddFieldFromNode(SFilterInfo *info, tExprNode *node, SFilterFieldI
     assert(node->_node.pRight->pVal->nLen < TSDB_COL_NAME_LEN);
     memset(node->_node.pLeft->pSchema->name, 0, TSDB_COL_NAME_LEN);
     strncpy(node->_node.pLeft->pSchema->name, node->_node.pRight->pVal->pz, node->_node.pRight->pVal->nLen);
-    v = node->pSchema;
-    node->pSchema = NULL;
+    v = node->_node.pLeft->pSchema;
+    node->_node.pLeft->pSchema = NULL;
   }else{
     CHK_RET(node->nodeType != TSQL_NODE_COL && node->nodeType != TSQL_NODE_VALUE, TSDB_CODE_QRY_APP_ERROR);
     if (node->nodeType == TSQL_NODE_COL) {
-- 
GitLab