Merge branch 'feature/TD-6129' of github.com:taosdata/TDengine into feature/TD-6129

src/client/src/tscSQLParser.c

@@ -2263,8 +2263,7 @@ int32_t addProjectionExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, t
       pToken = &left->columnName;
 
       tSqlExpr* right = pItem->pNode->pRight;
-      assert(right != NULL && right->type == SQL_NODE_VALUE);
-      if(right->tokenId != TK_STRING){
+      if(right != NULL || right->type != SQL_NODE_VALUE || right->tokenId != TK_STRING){
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
     }else {

src/client/src/tscUtil.c

@@ -5187,20 +5187,19 @@ void findTagValue(void* data, char* key, int32_t keyLen, char* out, int16_t len)
     void*    result = kvRowColVal(data, pColIdx);
 
     if (k % 2 != 0) {  // json key
-      char    tagJsonKey[TSDB_MAX_TAGS_LEN] = {0};
       if (JSON_TYPE_BINARY){
         if (keyLen != varDataLen(result)) continue;
         if (memcmp(varDataVal(result), key, keyLen) != 0) continue;
       } else if(JSON_TYPE_NCHAR){
+        char    tagJsonKey[TSDB_MAX_TAGS_LEN] = {0};
         int32_t length = taosUcs4ToMbs(varDataVal(result), varDataLen(result), tagJsonKey);
         if (length == 0) {
           tscError("charset:%s to %s. val:%s convert json key failed.", DEFAULT_UNICODE_ENCODEC, tsCharset,
                    (char*)result);
           continue;
         }
-        if (strncmp(key, tagJsonKey, keyLen) != 0) {
-          continue;
-        }
+        if (keyLen != length) continue;
+        if (strncmp(key, tagJsonKey, keyLen) != 0) continue;
       }
       found = true;
     } else {  // json value

src/query/src/qExecutor.c

@@ -7185,7 +7185,6 @@ static SSDataBlock* doTagScan(void* param, bool* newgroup) {
         dst  = pColInfo->pData + count * pExprInfo[j].base.resBytes;
         if (pExprInfo[j].base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
           data = tsdbGetTableName(item->pTable);
-
         } else {
           data = tsdbGetTableTagVal(item->pTable, pExprInfo[j].base.colInfo.colId, type, bytes);
           if(type == TSDB_DATA_TYPE_JSON){