From b059cc4ee13a9ad4c5970cf9c6dc671bc701a3e1 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Tue, 25 Apr 2023 10:59:02 +0800
Subject: [PATCH] chore: code optimization

---
 source/client/inc/clientInt.h  |  2 +-
 source/client/src/clientEnv.c  |  2 +-
 source/client/src/clientHb.c   | 13 +++++++++----
 source/client/src/clientMain.c | 10 +++++++---
 tests/script/api/passwdTest.c  |  7 +++----
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index 8e20d7d275..ab8e20b85e 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -361,7 +361,7 @@ void       stopAllRequests(SHashObj* pRequests);
 
 // conn level
 int  hbRegisterConn(SAppHbMgr* pAppHbMgr, int64_t tscRefId, int64_t clusterId, int8_t connType);
-void hbDeregisterConn(SAppHbMgr* pAppHbMgr, SClientHbKey connKey, void* param);
+void hbDeregisterConn(STscObj* pTscObj, SClientHbKey connKey);
 
 typedef struct SSqlCallbackWrapper {
   SParseContext* pParseCtx;
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 99569fdb57..ba02ae6731 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -239,7 +239,7 @@ void destroyTscObj(void *pObj) {
   tscTrace("begin to destroy tscObj %" PRIx64 " p:%p", tscId, pTscObj);
 
   SClientHbKey connKey = {.tscRid = pTscObj->id, .connType = pTscObj->connType};
-  hbDeregisterConn(pTscObj->pAppInfo->pAppHbMgr, connKey, pTscObj->passInfo.fp);
+  hbDeregisterConn(pTscObj, connKey);
 
   destroyAllRequests(pTscObj->pRequests);
   taosHashCleanup(pTscObj->pRequests);
diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index 79435da89f..4240a8510d 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -994,6 +994,7 @@ SAppHbMgr *appHbMgrInit(SAppInstInfo *pAppInstInfo, char *key) {
   // init stat
   pAppHbMgr->startTime = taosGetTimestampMs();
   pAppHbMgr->connKeyCnt = 0;
+  pAppHbMgr->passKeyCnt = 0;
   pAppHbMgr->reportCnt = 0;
   pAppHbMgr->reportBytes = 0;
   pAppHbMgr->key = taosStrdup(key);
@@ -1154,7 +1155,8 @@ int hbRegisterConn(SAppHbMgr *pAppHbMgr, int64_t tscRefId, int64_t clusterId, in
   }
 }
 
-void hbDeregisterConn(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, void *param) {
+void hbDeregisterConn(STscObj *pTscObj, SClientHbKey connKey) {
+  SAppHbMgr    *pAppHbMgr = pTscObj->pAppInfo->pAppHbMgr;
   SClientHbReq *pReq = taosHashAcquire(pAppHbMgr->activeInfo, &connKey, sizeof(SClientHbKey));
   if (pReq) {
     tFreeClientHbReq(pReq);
@@ -1167,7 +1169,10 @@ void hbDeregisterConn(SAppHbMgr *pAppHbMgr, SClientHbKey connKey, void *param) {
   }
 
   atomic_sub_fetch_32(&pAppHbMgr->connKeyCnt, 1);
-  if (param) {
-    atomic_sub_fetch_32(&pAppHbMgr->passKeyCnt, 1);
+
+  taosThreadMutexLock(&pTscObj->mutex);
+  if (pTscObj->passInfo.fp) {
+    int32_t cnt = atomic_sub_fetch_32(&pAppHbMgr->passKeyCnt, 1);
   }
-}
+  taosThreadMutexUnlock(&pTscObj->mutex);
+}
\ No newline at end of file
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index aed11b4fb1..55465f227e 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -134,11 +134,15 @@ int taos_set_notify_cb(TAOS *taos, __taos_notify_fn_t fp, void *param, int type)
 
   switch (type) {
     case TAOS_NOTIFY_PASSVER: {
+      taosThreadMutexLock(&pObj->mutex);
+      if (fp && !pObj->passInfo.fp) {
+        atomic_add_fetch_32(&pObj->pAppInfo->pAppHbMgr->passKeyCnt, 1);
+      } else if (!fp && pObj->passInfo.fp) {
+        atomic_sub_fetch_32(&pObj->pAppInfo->pAppHbMgr->passKeyCnt, 1);
+      }
       pObj->passInfo.fp = fp;
       pObj->passInfo.param = param;
-      if (fp) {
-        atomic_add_fetch_32(&pObj->pAppInfo->pAppHbMgr->passKeyCnt, 1);
-      }
+      taosThreadMutexUnlock(&pObj->mutex);
       break;
     }
     default: {
diff --git a/tests/script/api/passwdTest.c b/tests/script/api/passwdTest.c
index 8a2b0a0390..1bf4987689 100644
--- a/tests/script/api/passwdTest.c
+++ b/tests/script/api/passwdTest.c
@@ -33,8 +33,7 @@
 #define nUser    10
 #define USER_LEN 24
 
-void Test(TAOS *taos, char *qstr);
-void createUers(TAOS *taos, const char *host, char *qstr);
+void createUsers(TAOS *taos, const char *host, char *qstr);
 void passVerTestMulti(const char *host, char *qstr);
 
 int   nPassVerNotified = 0;
@@ -98,14 +97,14 @@ int main(int argc, char *argv[]) {
     printf("failed to connect to server, reason:%s\n", "null taos" /*taos_errstr(taos)*/);
     exit(1);
   }
-  createUers(taos, argv[1], qstr);
+  createUsers(taos, argv[1], qstr);
   passVerTestMulti(argv[1], qstr);
 
   taos_close(taos);
   taos_cleanup();
 }
 
-void createUers(TAOS *taos, const char *host, char *qstr) {
+void createUsers(TAOS *taos, const char *host, char *qstr) {
   // users
   for (int i = 0; i < nUser; ++i) {
     sprintf(users[i], "user%d", i);