xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
wangmm0220 2024-07-19 14:58:43 +08:00
parent 6b9c00cb9b
commit eaabc6d677
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/client/src/clientRawBlockWrite.c
View File

@ -197,7 +197,7 @@ static int32_t setCompressOption(cJSON* json, uint32_t para) {
cJSON* levelJson = cJSON_CreateString(levelStr); cJSON* levelJson = cJSON_CreateString(levelStr);
RAW_NULL_CHECK(levelJson); RAW_NULL_CHECK(levelJson);
RAW_FALSE_CHECK(cJSON_AddItemToObject(json, "level", levelJson)); RAW_FALSE_CHECK(cJSON_AddItemToObject(json, "level", levelJson));
return code return code;
} }
end: end:
@ -571,7 +571,8 @@ static void processAutoCreateTable(STaosxRsp* rsp, char** string) {
goto end; goto end;
} }
} }
cJSON* pJson = buildCreateCTableJson(pCreateReq, rsp->createTableNum); cJSON* pJson = NULL;
buildCreateCTableJson(pCreateReq, rsp->createTableNum, &pJson);
*string = cJSON_PrintUnformatted(pJson); *string = cJSON_PrintUnformatted(pJson);
cJSON_Delete(pJson); cJSON_Delete(pJson);
@ -588,7 +589,7 @@ end:
taosMemoryFree(pCreateReq); taosMemoryFree(pCreateReq);
} }
static cJSON* processAlterTable(SMqMetaRsp* metaRsp) { static void processAlterTable(SMqMetaRsp* metaRsp, cJSON** pJson) {
SDecoder decoder = {0}; SDecoder decoder = {0};
SVAlterTbReq vAlterTbReq = {0}; SVAlterTbReq vAlterTbReq = {0};
char* string = NULL; char* string = NULL;
@ -756,7 +757,7 @@ static cJSON* processAlterTable(SMqMetaRsp* metaRsp) {
end: end:
uDebug("alter table return, sql json:%s", cJSON_PrintUnformatted(json)); uDebug("alter table return, sql json:%s", cJSON_PrintUnformatted(json));
tDecoderClear(&decoder); tDecoderClear(&decoder);
return json; *pJson = json;
} }
static void processDropSTable(SMqMetaRsp* metaRsp, cJSON** pJson) { static void processDropSTable(SMqMetaRsp* metaRsp, cJSON** pJson) {

20
source/client/test/CMakeLists.txt
View File

@ -23,11 +23,11 @@ TARGET_LINK_LIBRARIES(
PUBLIC os util common transport parser catalog scheduler function gtest taos_static qcom geometry 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( TARGET_INCLUDE_DIRECTORIES(
clientTest clientTest
@ -47,11 +47,11 @@ TARGET_INCLUDE_DIRECTORIES(
PRIVATE "${TD_SOURCE_DIR}/source/client/inc" 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( add_test(
NAME smlTest NAME smlTest