From e063a8092c5eaae8f5c713cad25b4239f71efb0d Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Thu, 1 Aug 2024 09:08:04 +0800
Subject: [PATCH] refact code

---
 source/libs/qcom/src/queryUtil.c  | 11 ++++++-----
 source/libs/transport/src/trans.c |  8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/source/libs/qcom/src/queryUtil.c b/source/libs/qcom/src/queryUtil.c
index bce8cda125..406e1e674e 100644
--- a/source/libs/qcom/src/queryUtil.c
+++ b/source/libs/qcom/src/queryUtil.c
@@ -225,6 +225,7 @@ int32_t asyncSendMsgToServerExt(void* pTransporter, SEpSet* epSet, int64_t* pTra
     .code = 0
   };
   TRACE_SET_ROOTID(&rpcMsg.info.traceId, pInfo->requestId);
+
   int code = rpcSendRequestWithCtx(pTransporter, epSet, &rpcMsg, pTransporterId, rpcCtx);
   if (code) {
     destroySendMsgInfo(pInfo);
@@ -448,13 +449,13 @@ void parseTagDatatoJson(void* p, char** jsonStr) {
       if (value == NULL) {
         goto end;
       }
-      if(!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);
+        char* tagJsonValue = taosMemoryCalloc(pTagVal->nData, 1);
         if (tagJsonValue == NULL) {
           goto end;
         }
@@ -479,7 +480,7 @@ void parseTagDatatoJson(void* p, char** jsonStr) {
         goto end;
       }
 
-      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+      if (!cJSON_AddItemToObject(json, tagJsonKey, value)) {
         goto end;
       }
     } else if (type == TSDB_DATA_TYPE_DOUBLE) {
@@ -488,7 +489,7 @@ void parseTagDatatoJson(void* p, char** jsonStr) {
       if (value == NULL) {
         goto end;
       }
-      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+      if (!cJSON_AddItemToObject(json, tagJsonKey, value)) {
         goto end;
       }
     } else if (type == TSDB_DATA_TYPE_BOOL) {
@@ -497,7 +498,7 @@ void parseTagDatatoJson(void* p, char** jsonStr) {
       if (value == NULL) {
         goto end;
       }
-      if(!cJSON_AddItemToObject(json, tagJsonKey, value)){
+      if (!cJSON_AddItemToObject(json, tagJsonKey, value)) {
         goto end;
       }
     } else {
diff --git a/source/libs/transport/src/trans.c b/source/libs/transport/src/trans.c
index 21c16afb28..643be07058 100644
--- a/source/libs/transport/src/trans.c
+++ b/source/libs/transport/src/trans.c
@@ -167,7 +167,11 @@ int32_t rpcSendRequest(void* shandle, const SEpSet* pEpSet, SRpcMsg* pMsg, int64
   return transSendRequest(shandle, pEpSet, pMsg, NULL);
 }
 int32_t rpcSendRequestWithCtx(void* shandle, const SEpSet* pEpSet, SRpcMsg* pMsg, int64_t* pRid, SRpcCtx* pCtx) {
-  return transSendRequest(shandle, pEpSet, pMsg, pCtx);
+  if (pCtx != NULL) {
+    return transSendRequest(shandle, pEpSet, pMsg, pCtx);
+  } else {
+    return transSendRequestWithId(shandle, pEpSet, pMsg, pRid);
+  }
 }
 
 int32_t rpcSendRequestWithId(void* shandle, const SEpSet* pEpSet, STransMsg* pReq, int64_t* transpointId) {
@@ -178,7 +182,7 @@ int32_t rpcSendRecv(void* shandle, SEpSet* pEpSet, SRpcMsg* pMsg, SRpcMsg* pRsp)
   return transSendRecv(shandle, pEpSet, pMsg, pRsp);
 }
 int32_t rpcSendRecvWithTimeout(void* shandle, SEpSet* pEpSet, SRpcMsg* pMsg, SRpcMsg* pRsp, int8_t* epUpdated,
-                           int32_t timeoutMs) {
+                               int32_t timeoutMs) {
   return transSendRecvWithTimeout(shandle, pEpSet, pMsg, pRsp, epUpdated, timeoutMs);
 }
 int32_t rpcFreeConnById(void* shandle, int64_t connId) { return transFreeConnById(shandle, connId); }