Merge pull request #26685 from taosdata/opti/TD-31017

fix:[TD-31017]process return value in clientRawBlockWrite.c

include/libs/qcom/query.h

@@ -335,7 +335,7 @@ SSchema createSchema(int8_t type, int32_t bytes, col_id_t colId, const char* nam
 
 void    destroyQueryExecRes(SExecResult* pRes);
 int32_t dataConverToStr(char* str, int type, void* buf, int32_t bufSize, int32_t* len);
-char*   parseTagDatatoJson(void* p);
+void    parseTagDatatoJson(void* p, char** jsonStr);
 int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst);
 void    getColumnTypeFromMeta(STableMeta* pMeta, char* pName, ETableColumnType* pType);
 int32_t cloneDbVgInfo(SDBVgInfo* pSrc, SDBVgInfo** pDst);

include/util/taoserror.h

@@ -53,7 +53,7 @@ int32_t  taosGetErrSize();
 #define terrln                              (*taosGetErrln())
 
 #define SET_ERROR_MSG(MSG, ...) \
-  snprintf(terrMsg, ERR_MSG_LEN, MSG, ##__VA_ARGS__)
+  (void)snprintf(terrMsg, ERR_MSG_LEN, MSG, ##__VA_ARGS__)
 
 #define TSDB_CODE_SUCCESS                   0
 #define TSDB_CODE_FAILED                    -1   // unknown or needn't tell detail error

source/client/src/clientImpl.c

@@ -2007,7 +2007,8 @@ static int32_t doConvertJson(SReqResultInfo* pResultInfo, int32_t numOfCols, int
           sprintf(varDataVal(dst), "%s", TSDB_DATA_NULL_STR_L);
           varDataSetLen(dst, strlen(varDataVal(dst)));
         } else if (tTagIsJson(data)) {
-          char* jsonString = parseTagDatatoJson(data);
+          char* jsonString = NULL;
+          parseTagDatatoJson(data, &jsonString);
           STR_TO_VARSTR(dst, jsonString);
           taosMemoryFree(jsonString);
         } else if (jsonInnerType == TSDB_DATA_TYPE_NCHAR) {  // value -> "value"

source/client/test/CMakeLists.txt

@@ -23,11 +23,11 @@ TARGET_LINK_LIBRARIES(
         PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom geometry
 )
 
-ADD_EXECUTABLE(clientMonitorTest clientMonitorTests.cpp)
+#ADD_EXECUTABLE(clientMonitorTest clientMonitorTests.cpp)
-TARGET_LINK_LIBRARIES(
+#TARGET_LINK_LIBRARIES(
-        clientMonitorTest
+#        clientMonitorTest
-        PUBLIC os util common transport monitor parser catalog scheduler function gtest taos_static qcom executor
+#        PUBLIC os util common transport monitor parser catalog scheduler function gtest taos_static qcom executor
-)
+#)
 
 TARGET_INCLUDE_DIRECTORIES(
         clientTest
@@ -47,11 +47,11 @@ TARGET_INCLUDE_DIRECTORIES(
         PRIVATE "${TD_SOURCE_DIR}/source/client/inc"
 )
 
-TARGET_INCLUDE_DIRECTORIES(
+#TARGET_INCLUDE_DIRECTORIES(
-        clientMonitorTest
+#        clientMonitorTest
-        PUBLIC "${TD_SOURCE_DIR}/include/client/"
+#        PUBLIC "${TD_SOURCE_DIR}/include/client/"
-        PRIVATE "${TD_SOURCE_DIR}/source/client/inc"
+#        PRIVATE "${TD_SOURCE_DIR}/source/client/inc"
-)
+#)
 
 add_test(
         NAME smlTest

source/common/src/tmsg.c

@@ -10828,7 +10828,9 @@ int32_t tDecodeMqBatchMetaRsp(SDecoder *pDecoder, SMqBatchMetaRsp *pRsp) {
   if (tDecodeI32(pDecoder, &size) < 0) return -1;
   if (size > 0) {
     pRsp->batchMetaReq = taosArrayInit(size, POINTER_BYTES);
+    if (!pRsp->batchMetaReq) return -1;
     pRsp->batchMetaLen = taosArrayInit(size, sizeof(int32_t));
+    if (!pRsp->batchMetaLen) return -1;
     for (int32_t i = 0; i < size; i++) {
       void    *pCreate = NULL;
       uint64_t len = 0;

source/libs/catalog/src/catalog.c

@@ -446,7 +446,8 @@ int32_t ctgGetTbTag(SCatalog* pCtg, SRequestConnInfo* pConn, SName* pTableName,
       CTG_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY);
     }
 
-    char* pJson = parseTagDatatoJson(pTag);
+    char* pJson = NULL;
+    parseTagDatatoJson(pTag, &pJson);
     STagVal tagVal;
     tagVal.cid = 0;
     tagVal.type = TSDB_DATA_TYPE_JSON;

source/libs/catalog/src/ctgAsync.c

@@ -2079,7 +2079,8 @@ int32_t ctgHandleGetTbTagRsp(SCtgTaskReq* tReq, int32_t reqType, const SDataBuf*
       CTG_ERR_JRET(TSDB_CODE_OUT_OF_MEMORY);
     }
 
-    char* pJson = parseTagDatatoJson(pTag);
+    char* pJson = NULL;
+    parseTagDatatoJson(pTag, &pJson);
     STagVal tagVal;
     tagVal.cid = 0;
     tagVal.type = TSDB_DATA_TYPE_JSON;

source/libs/command/src/command.c

@@ -503,11 +503,10 @@ int32_t appendTagValues(char* buf, int32_t* len, STableCfg* pCfg) {
   }
 
   if (tTagIsJson(pTag)) {
-    char* pJson = parseTagDatatoJson(pTag);
+    char* pJson = NULL;
-    if (pJson) {
+    parseTagDatatoJson(pTag, &pJson);
-      *len += sprintf(buf + VARSTR_HEADER_SIZE + *len, "%s", pJson);
+    *len += sprintf(buf + VARSTR_HEADER_SIZE + *len, "%s", pJson);
-      taosMemoryFree(pJson);
+    taosMemoryFree(pJson);
-    }
 
     return TSDB_CODE_SUCCESS;
   }

source/libs/executor/src/sysscanoperator.c

@@ -966,7 +966,8 @@ static int32_t sysTableUserTagsFillOneTableTags(const SSysTableScanInfo* pInfo,
     char* tagVarChar = NULL;
     if (tagData != NULL) {
       if (tagType == TSDB_DATA_TYPE_JSON) {
-        char* tagJson = parseTagDatatoJson(tagData);
+        char* tagJson = NULL;
+        parseTagDatatoJson(tagData, &tagJson);
         tagVarChar = taosMemoryMalloc(strlen(tagJson) + VARSTR_HEADER_SIZE);
         memcpy(varDataVal(tagVarChar), tagJson, strlen(tagJson));
         varDataSetLen(tagVarChar, strlen(tagJson));

source/libs/qcom/src/queryUtil.c

@@ -417,7 +417,7 @@ int32_t dataConverToStr(char* str, int type, void* buf, int32_t bufSize, int32_t
   return TSDB_CODE_SUCCESS;
 }
 
-char* parseTagDatatoJson(void* p) {
+void parseTagDatatoJson(void* p, char** jsonStr) {
   char*   string = NULL;
   SArray* pTagVals = NULL;
   cJSON*  json = NULL;
@@ -436,6 +436,9 @@ char* parseTagDatatoJson(void* p) {
   }
   for (int j = 0; j < nCols; ++j) {
     STagVal* pTagVal = (STagVal*)taosArrayGet(pTagVals, j);
+    if (pTagVal == NULL) {
+      continue;
+    }
     // json key  encode by binary
     tstrncpy(tagJsonKey, pTagVal->pKey, sizeof(tagJsonKey));
     // json value
@@ -445,11 +448,16 @@ char* parseTagDatatoJson(void* p) {
       if (value == NULL) {
         goto end;
       }
-      cJSON_AddItemToObject(json, tagJsonKey, value);
+      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+        goto end;
+      }
     } else if (type == TSDB_DATA_TYPE_NCHAR) {
       cJSON* value = NULL;
       if (pTagVal->nData > 0) {
         char*   tagJsonValue = taosMemoryCalloc(pTagVal->nData, 1);
+        if (tagJsonValue == NULL) {
+          goto end;
+        }
         int32_t length = taosUcs4ToMbs((TdUcs4*)pTagVal->pData, pTagVal->nData, tagJsonValue);
         if (length < 0) {
           qError("charset:%s to %s. val:%s convert json value failed.", DEFAULT_UNICODE_ENCODEC, tsCharset,
@@ -464,25 +472,34 @@ char* parseTagDatatoJson(void* p) {
         }
       } else if (pTagVal->nData == 0) {
         value = cJSON_CreateString("");
+        if (value == NULL) {
+          goto end;
+        }
       } else {
         goto end;
       }
 
-      cJSON_AddItemToObject(json, tagJsonKey, value);
+      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+        goto end;
+      }
     } else if (type == TSDB_DATA_TYPE_DOUBLE) {
       double jsonVd = *(double*)(&pTagVal->i64);
       cJSON* value = cJSON_CreateNumber(jsonVd);
       if (value == NULL) {
         goto end;
       }
-      cJSON_AddItemToObject(json, tagJsonKey, value);
+      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+        goto end;
+      }
     } else if (type == TSDB_DATA_TYPE_BOOL) {
       char   jsonVd = *(char*)(&pTagVal->i64);
       cJSON* value = cJSON_CreateBool(jsonVd);
       if (value == NULL) {
         goto end;
       }
-      cJSON_AddItemToObject(json, tagJsonKey, value);
+      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+        goto end;
+      }
     } else {
       goto end;
     }
@@ -494,7 +511,7 @@ end:
   if (string == NULL) {
     string = taosStrdup(TSDB_DATA_NULL_STR_L);
   }
-  return string;
+  *jsonStr = string;
 }
 
 int32_t cloneTableMeta(STableMeta* pSrc, STableMeta** pDst) {

utils/test/c/write_raw_block_test.c

@@ -171,7 +171,7 @@ int32_t init_env() {
   }
 
   // pass NULL return last error code describe
-  const char* err = taos_errstr(NULL);
+  const char* err = tmq_err2str(error_code);
   printf("write_raw_block return code =0x%x err=%s\n", error_code, err);
   if(strcmp(err, "success") == 0) {
       printf("expect failed , but error string is success! err=%s\n", err);
@@ -185,7 +185,7 @@ int32_t init_env() {
       goto END;
   }
 
-  err = taos_errstr(NULL);
+  err = tmq_err2str(error_code);
   printf("write_raw_block no exist table return code =0x%x err=%s\n", error_code, err);
   if(strcmp(err, "success") == 0) {
       printf("expect failed write no exist table, but error string is success! err=%s\n", err);