diff --git a/src/client/src/tscAst.c b/src/client/src/tscAst.c
index d071358dbf0b9611eabac34d5f4a87eef0b6a646..b9b00bb944fda52a5e28edda69922763795897fa 100644
--- a/src/client/src/tscAst.c
+++ b/src/client/src/tscAst.c
@@ -115,6 +115,9 @@ static tSQLSyntaxNode *tSQLSyntaxNodeCreate(SSchema *pSchema, int32_t numOfCols,
     int32_t i = 0;
     if (pToken->type == TK_ID) {
       do {
+        SSQLToken tableToken = {0};
+        extractTableNameFromToken(pToken, &tableToken);
+        
         size_t len = strlen(pSchema[i].name);
         if (strncmp(pToken->z, pSchema[i].name, pToken->n) == 0 && pToken->n == len) break;
       } while (++i < numOfCols);
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 36895c1da0c83974fa2efedb0e3c23c7324804e7..2c31c42157461c47272d40ed04093ec833640481 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -2876,31 +2876,14 @@ int32_t buildArithmeticExprString(tSQLExpr* pExpr, char** exprString) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t validateSQLExpr(tSQLExpr* pExpr, SSchema* pSchema, int32_t numOfCols, SColumnIdListRes* pList) {
+static int32_t validateSQLExpr(tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList) {
   if (pExpr->nSQLOptr == TK_ID) {
-    bool validColumnName = false;
-
-    SColumnList* list = &pList->list;
-
-    for (int32_t i = 0; i < numOfCols; ++i) {
-      if (strncasecmp(pExpr->colInfo.z, pSchema[i].name, pExpr->colInfo.n) == 0 &&
-          pExpr->colInfo.n == strlen(pSchema[i].name)) {
-        if (pSchema[i].type < TSDB_DATA_TYPE_TINYINT || pSchema[i].type > TSDB_DATA_TYPE_DOUBLE) {
-          return TSDB_CODE_INVALID_SQL;
-        }
-
-        if (pList != NULL) {
-          list->ids[list->num++].columnIndex = (int16_t)i;
-        }
-
-        validColumnName = true;
+      SColumnIndex index = COLUMN_INDEX_INITIALIZER;
+      if (getColumnIndexByName(&pExpr->colInfo, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
+        return TSDB_CODE_INVALID_SQL;
       }
-    }
-
-    if (!validColumnName) {
-      return TSDB_CODE_INVALID_SQL;
-    }
-
+      
+      pList->ids[pList->num++].columnIndex = index.columnIndex;
   } else if (pExpr->nSQLOptr == TK_FLOAT && (isnan(pExpr->val.dKey) || isinf(pExpr->val.dKey))) {
     return TSDB_CODE_INVALID_SQL;
   } else if (pExpr->nSQLOptr >= TK_MIN && pExpr->nSQLOptr <= TK_LAST_ROW) {
@@ -2910,20 +2893,19 @@ static int32_t validateSQLExpr(tSQLExpr* pExpr, SSchema* pSchema, int32_t numOfC
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t validateArithmeticSQLExpr(tSQLExpr* pExpr, SSchema* pSchema, int32_t numOfCols,
-                                         SColumnIdListRes* pList) {
+static int32_t validateArithmeticSQLExpr(tSQLExpr* pExpr, SQueryInfo* pQueryInfo, SColumnList* pList) {
   if (pExpr == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
   tSQLExpr* pLeft = pExpr->pLeft;
   if (pLeft->nSQLOptr >= TK_PLUS && pLeft->nSQLOptr <= TK_REM) {
-    int32_t ret = validateArithmeticSQLExpr(pLeft, pSchema, numOfCols, pList);
+    int32_t ret = validateArithmeticSQLExpr(pLeft, pQueryInfo, pList);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
   } else {
-    int32_t ret = validateSQLExpr(pLeft, pSchema, numOfCols, pList);
+    int32_t ret = validateSQLExpr(pLeft, pQueryInfo, pList);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -2931,12 +2913,12 @@ static int32_t validateArithmeticSQLExpr(tSQLExpr* pExpr, SSchema* pSchema, int3
 
   tSQLExpr* pRight = pExpr->pRight;
   if (pRight->nSQLOptr >= TK_PLUS && pRight->nSQLOptr <= TK_REM) {
-    int32_t ret = validateArithmeticSQLExpr(pRight, pSchema, numOfCols, pList);
+    int32_t ret = validateArithmeticSQLExpr(pRight, pQueryInfo, pList);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
   } else {
-    int32_t ret = validateSQLExpr(pRight, pSchema, numOfCols, pList);
+    int32_t ret = validateSQLExpr(pRight, pQueryInfo, pList);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
diff --git a/src/system/detail/src/vnodeUtil.c b/src/system/detail/src/vnodeUtil.c
index 943bec4250884330d167e83188662f1b5b97f8cd..d14d2b66f0a4f84335dfdf328a326bd73ffc4ae7 100644
--- a/src/system/detail/src/vnodeUtil.c
+++ b/src/system/detail/src/vnodeUtil.c
@@ -195,9 +195,9 @@ static int32_t vnodeBuildExprFromArithmeticStr(SSqlFunctionExpr* pExpr, SQueryMe
   num = i + 1;
   pBinaryExprInfo->pReqColumns = malloc(sizeof(SColIndexEx) * num);
 
-  for (int32_t i = 0; i < num; ++i) {
-    SColIndexEx* pColIndex = &pBinaryExprInfo->pReqColumns[i];
-    pColIndex->colId = ids[i];
+  for (int32_t k = 0; k < num; ++k) {
+    SColIndexEx* pColIndex = &pBinaryExprInfo->pReqColumns[k];
+    pColIndex->colId = ids[k];
   }
 
   pBinaryExprInfo->numOfCols = num;
@@ -252,7 +252,7 @@ SSqlFunctionExpr* vnodeCreateSqlFunctionExpr(SQueryMeterMsg* pQueryMsg, int32_t*
       if (pColumnIndexExInfo->colIdx >= pQueryMsg->numOfTagsCols) {
         *code = TSDB_CODE_INVALID_QUERY_MSG;
         tfree(pExprs);
-        break;
+        return NULL;
       }
 
       type = pTagSchema[pColumnIndexExInfo->colIdx].type;
@@ -264,7 +264,7 @@ SSqlFunctionExpr* vnodeCreateSqlFunctionExpr(SQueryMeterMsg* pQueryMsg, int32_t*
 
         if (*code != TSDB_CODE_SUCCESS) {
           tfree(pExprs);
-          break;
+          return NULL;
         }
 
         type = TSDB_DATA_TYPE_DOUBLE;