Merge pull request #11037 from taosdata/fix/TD-14342-2.4

Fix/td 14342 2.4

src/query/src/qFilter.c

@@ -3608,16 +3608,11 @@ int32_t filterConverNcharColumns(SFilterInfo* info, int32_t rows, bool *gotNchar
       for (int32_t j = 0; j < rows; ++j) {
         char *src = FILTER_GET_COL_FIELD_DATA(fi, j);
         char *dst = FILTER_GET_COL_FIELD_DATA(&nfi, j);
-        int32_t len = 0;
-        char *varSrc = varDataVal(src);
-        size_t k = 0, varSrcLen = varDataLen(src);
-        while (k < varSrcLen && varSrc[k++] == -1) {}
-        if (k == varSrcLen) {
-          /* NULL */
-          varDataLen(dst) = (VarDataLenT) varSrcLen;
+        if(isNull(src, TSDB_DATA_TYPE_NCHAR)){
           varDataCopy(dst, src);
           continue;
         }
+        int32_t len = 0;
         bool ret = taosMbsToUcs4(varDataVal(src), varDataLen(src), varDataVal(dst), bufSize, &len);
         if(!ret) {
           qError("filterConverNcharColumns taosMbsToUcs4 error");

tests/pytest/query/nestedQuery/nestedQuery_datacheck.py

@@ -619,9 +619,11 @@ class TDTestCase:
             sql += "%s )" % random.choice(t_join_where)
             datacheck = self.stable_join_checkall_0(sql)           
             tdSql.checkRows(100)
-            datacheck = self.stable_join_checkall_100(sql)       
- 
+            datacheck = self.stable_join_checkall_100(sql)
 
+            # for TD-14342
+            sql = "select  * from  ( select  * from stable_1 ) where t_nchar like 'nchar%' or t_nchar = '0'"
+            datacheck = self.stable1_checkall_0(sql)
         endTime = time.time()
         print("total time %ds" % (endTime - startTime))