From 1402942f35d35d0d26a4db6dfc21c22bdfabeb34 Mon Sep 17 00:00:00 2001
From: yihaoDeng <luomoxyz@126.com>
Date: Sat, 28 Sep 2024 14:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0' into
 enh/opt-transport

---
 source/libs/transport/src/transCli.c | 5 +++--
 source/libs/transport/src/transSvr.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c
index 6156f224db..af765ca112 100644
--- a/source/libs/transport/src/transCli.c
+++ b/source/libs/transport/src/transCli.c
@@ -354,7 +354,7 @@ int32_t cliGetConnTimer(SCliThrd* pThrd, SCliConn* pConn) {
     tDebug("no available timer, create a timer %p", timer);
     int ret = uv_timer_init(pThrd->loop, timer);
     if (ret != 0) {
-      tError("conn %p failed to init timer %p, ret:%d", pConn, timer, uv_err_name(ret));
+      tError("conn %p failed to init timer %p since %s", pConn, timer, uv_err_name(ret));
       return TSDB_CODE_THIRDPARTY_ERROR;
     }
   }
@@ -1063,7 +1063,8 @@ static void cliDestroy(uv_handle_t* handle) {
     int64_t* qid = taosHashGetKey(pIter, NULL);
     code = taosHashRemove(pThrd->pIdConnTable, qid, sizeof(*qid));
     if (code != 0) {
-      tDebug("%s conn %p failed to remove state %" PRId64 " since %s", CONN_GET_INST_LABEL(conn), conn, *qid, code);
+      tDebug("%s conn %p failed to remove state %" PRId64 " since %s", CONN_GET_INST_LABEL(conn), conn, *qid,
+             tstrerror(code));
     }
     pIter = taosHashIterate(conn->pQTable, pIter);
     tDebug("%s conn %p destroy state %" PRId64 "", CONN_GET_INST_LABEL(conn), conn, *qid);
diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c
index e2d0405e1f..69e4bdd485 100644
--- a/source/libs/transport/src/transSvr.c
+++ b/source/libs/transport/src/transSvr.c
@@ -870,7 +870,8 @@ int32_t uvMayHandleReleaseResp(SSvrRespMsg* pMsg) {
       transFreeMsg(p->msg.pCont);
       code = taosHashRemove(pConn->pQTable, &qid, sizeof(qid));
       if (code != 0) {
-        tError("%s conn %p failed release qid:%d since %s", transLabel(pConn->pInst), pConn, tstrerror(code));
+        tError("%s conn %p failed to release qid:%" PRId64 " since %s", transLabel(pConn->pInst), pConn, qid,
+               tstrerror(code));
       }
     }
   }
@@ -1131,7 +1132,7 @@ void uvOnConnectionCb(uv_stream_t* q, ssize_t nread, const uv_buf_t* buf) {
     }
     code = uv_read_start((uv_stream_t*)(pConn->pTcp), uvAllocRecvBufferCb, uvOnRecvCb);
     if (code != 0) {
-      tWarn("%s conn %p failed to start to read since %s", uv_err_name(code));
+      tWarn("conn %p failed to start to read since %s", pConn, uv_err_name(code));
       transUnrefSrvHandle(pConn);
       return;
     }