fix group by json tag format [change json type with qid return logic]

src/client/src/tscSubquery.c

@@ -725,8 +725,8 @@ int32_t tagValCompar(const void* p1, const void* p2) {
   const STidTags* t2 = (const STidTags*) varDataVal(p2);
 
   if (t1->padding == TSDB_DATA_TYPE_JSON){
-    bool f1IsNull = (*t1->tag == TSDB_DATA_TYPE_NCHAR && isNull(t1->tag + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
-    bool f2IsNull = (*t1->tag == TSDB_DATA_TYPE_NCHAR && isNull(t1->tag + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
+    bool f1IsNull = (*t1->tag == TSDB_DATA_TYPE_JSON && isNull(t1->tag + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
+    bool f2IsNull = (*t1->tag == TSDB_DATA_TYPE_JSON && isNull(t1->tag + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
     if(f1IsNull && f2IsNull){
       return 0;
     }else if(f1IsNull && !f2IsNull){

src/query/src/qExtbuffer.c

@@ -368,8 +368,8 @@ static int32_t tsCompareFunc(TSKEY k1, TSKEY k2, int32_t order) {
 
 int32_t columnValueAscendingComparator(char *f1, char *f2, int32_t type, int32_t bytes) {
   if (type == TSDB_DATA_TYPE_JSON){
-    bool f1IsNull = (*f1 == TSDB_DATA_TYPE_NCHAR && isNull(f1 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
-    bool f2IsNull = (*f2 == TSDB_DATA_TYPE_NCHAR && isNull(f2 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
+    bool f1IsNull = (*f1 == TSDB_DATA_TYPE_JSON && isNull(f1 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
+    bool f2IsNull = (*f2 == TSDB_DATA_TYPE_JSON && isNull(f2 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
     if(f1IsNull && f2IsNull){
       return 0;
     }else if(f1IsNull && !f2IsNull){

src/util/src/tcompare.c

@@ -577,8 +577,8 @@ __compar_fn_t getKeyComparFunc(int32_t keyType, int32_t order) {
 
 int32_t doCompare(const char* f1, const char* f2, int32_t type, size_t size) {
   if (type == TSDB_DATA_TYPE_JSON){
-    bool f1IsNull = (*f1 == TSDB_DATA_TYPE_NCHAR && isNull(f1 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
-    bool f2IsNull = (*f2 == TSDB_DATA_TYPE_NCHAR && isNull(f2 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
+    bool f1IsNull = (*f1 == TSDB_DATA_TYPE_JSON && isNull(f1 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
+    bool f2IsNull = (*f2 == TSDB_DATA_TYPE_JSON && isNull(f2 + CHAR_BYTES, TSDB_DATA_TYPE_JSON));
     if(f1IsNull && f2IsNull){
       return 0;
     }else if(f1IsNull && !f2IsNull){